From 60a7e36f9be2711d96a784fdd38b55ad36953b51 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 8 Feb 2022 18:07:59 +0100 Subject: [PATCH 1/3] Revert "Fix loading of the text app in public shared links" This reverts commit d3d117c4a874eb8803fb043b2b011d8732b2709f. Signed-off-by: Carl Schwan --- core/css/public.scss | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/core/css/public.scss b/core/css/public.scss index e0ca670fcdbb6..31e48f3c7ccd3 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -9,19 +9,10 @@ /** Center the shared content inside the page */ &.app-files_sharing { + justify-content: center; + align-items: center; #app-content { - min-height: 100%; - display: flex; - } - - #files-public-content { - flex-grow: 2; - display: grid; - } - - #preview { - justify-self: center; - align-self: center; + min-height: inherit; padding-left: 1rem; padding-right: 1rem; } From 16e9e242ed85d656347d8d0cd8dec5d55a4d8152 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 8 Feb 2022 18:09:24 +0100 Subject: [PATCH 2/3] Revert "Improve layout for the public download page" This reverts commit 2e55ce089954bdab483cb1564a4b00b79b705346. Signed-off-by: Carl Schwan --- core/css/public.scss | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/core/css/public.scss b/core/css/public.scss index 31e48f3c7ccd3..b171dd4970d8a 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -1,25 +1,8 @@ -#body-public { - min-height: 100vh; - display: flex; - flex-direction: column; - - #content { - flex-grow: 2; - min-height: initial; - - /** Center the shared content inside the page */ - &.app-files_sharing { - justify-content: center; - align-items: center; - #app-content { - min-height: inherit; - padding-left: 1rem; - padding-right: 1rem; - } - } - } +$footer-height: 65px; +#body-public { .header-right { + #header-primary-action a { color: var(--color-primary-text); } @@ -52,6 +35,12 @@ } } + #content { + // 100% - footer + min-height: calc(100% - #{$footer-height}); + + } + /** don't apply content header padding on the base layout */ &.layout-base #content { padding-top: 0; @@ -83,8 +72,8 @@ display: flex; align-items: center; justify-content: center; + height: $footer-height; flex-direction: column; - padding: 0.5rem; p { text-align: center; color: var(--color-text-lighter); From f0424378f68ee222bc9914af6e391624d9f3c711 Mon Sep 17 00:00:00 2001 From: szaimen Date: Wed, 9 Feb 2022 09:47:44 +0100 Subject: [PATCH 3/3] Revert "Add non-breaking space in the file size" Signed-off-by: szaimen --- apps/files_sharing/lib/Controller/ShareController.php | 2 +- apps/files_sharing/templates/public.php | 4 ++-- .../tests/Controller/ShareControllerTest.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index b4a332d74198e..614dae7ffba6a 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -385,7 +385,7 @@ public function showShare($path = ''): TemplateResponse { $shareTmpl['protected'] = $share->getPassword() !== null ? 'true' : 'false'; $shareTmpl['dir'] = ''; $shareTmpl['nonHumanFileSize'] = $shareNode->getSize(); - $shareTmpl['fileSize'] = str_replace(' ', ' ', \OCP\Util::humanFileSize($shareNode->getSize())); + $shareTmpl['fileSize'] = \OCP\Util::humanFileSize($shareNode->getSize()); $shareTmpl['hideDownload'] = $share->getHideDownload(); $hideFileList = false; diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 677f015ce81d6..33dd6ecd1898d 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -75,7 +75,7 @@
- () + ()
@@ -87,7 +87,7 @@
- () +  ()
diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php index 512a61d811e32..be2616f70fc90 100644 --- a/apps/files_sharing/tests/Controller/ShareControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php @@ -329,7 +329,7 @@ public function testShowShare() { 'protected' => 'true', 'dir' => '', 'downloadURL' => 'downloadURL', - 'fileSize' => '33 B', + 'fileSize' => '33 B', 'nonHumanFileSize' => 33, 'maxSizeAnimateGif' => 10, 'previewSupported' => true, @@ -480,7 +480,7 @@ public function testShowShareWithPrivateName() { 'protected' => 'true', 'dir' => '', 'downloadURL' => 'downloadURL', - 'fileSize' => '33 B', + 'fileSize' => '33 B', 'nonHumanFileSize' => 33, 'maxSizeAnimateGif' => 10, 'previewSupported' => true, @@ -631,7 +631,7 @@ public function testShowShareHideDownload() { 'protected' => 'true', 'dir' => '', 'downloadURL' => 'downloadURL', - 'fileSize' => '33 B', + 'fileSize' => '33 B', 'nonHumanFileSize' => 33, 'maxSizeAnimateGif' => 10, 'previewSupported' => true, @@ -756,7 +756,7 @@ public function testShareFileDrop() { 'protected' => 'false', 'dir' => null, 'downloadURL' => '', - 'fileSize' => '1 KB', + 'fileSize' => '1 KB', 'nonHumanFileSize' => 1337, 'maxSizeAnimateGif' => null, 'previewSupported' => null,