From 3d05540d36e741fade7ff32e2b0c6985782c4c72 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sat, 12 Aug 2017 15:14:59 +0200 Subject: [PATCH 01/11] Move shared page controls to menu in top right Signed-off-by: Jan-Christoph Borchardt --- apps/files_sharing/css/public.scss | 19 +++++---- apps/files_sharing/templates/public.php | 54 ++++++++++++++++--------- 2 files changed, 43 insertions(+), 30 deletions(-) diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index 652d36f77d..c87ae46b5d 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -3,6 +3,11 @@ min-height: calc(100vh - 120px); } +#header .menutoggle { + padding: 14px; + cursor: pointer; +} + /* force layout to make sure the content element's height matches its contents' height */ .ie #content { display: inline-block; @@ -78,12 +83,6 @@ thead { margin: 0; } - -.directDownload, -.directLink { - margin-bottom: 20px; -} - /* keep long file names in one line to not overflow download button on mobile */ .directDownload #downloadFile { white-space: nowrap; @@ -125,6 +124,7 @@ thead { /* within #save */ #save .save-form { position: relative; + margin-right: -10px; } #remote_address { @@ -138,10 +138,9 @@ thead { position: absolute; background-color: transparent; border: none; - margin: 2px 4px !important; - right: 7px; - top: -8px; - height: 30px; + margin: 0; + right: 0px; + height: 40px; } #public-upload .avatardiv { diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 8bbb53fa4e..0c12c86da0 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -48,22 +48,38 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
- - - - - - - - - t('Download'))?> - + + +
@@ -84,16 +100,14 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
t('Download %s', array($_['filename'])))?> ()
-
- - -
+ From 93d14dd315c9af18b1e148f7ccb4fe931b20822b Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 26 Sep 2017 13:07:32 +0200 Subject: [PATCH 02/11] Fix header text hiding completely or wrapping wrongly Signed-off-by: Jan-Christoph Borchardt --- core/css/header.scss | 2 ++ core/css/mobile.scss | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/core/css/header.scss b/core/css/header.scss index c03fa2aa0d..1e5e284672 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -143,6 +143,8 @@ #header-left, .header-left { flex: 0 0; flex-grow: 1; + overflow: hidden; + white-space: nowrap; } #header-right, .header-right { diff --git a/core/css/mobile.scss b/core/css/mobile.scss index baf874db8f..58bb076d81 100644 --- a/core/css/mobile.scss +++ b/core/css/mobile.scss @@ -31,11 +31,6 @@ align-items: center; } -/* on mobile public share, show only the icon of the logo, hide the text */ -#body-public #header .header-appname-container { - display: none; -} - /* do not show update notification on mobile */ #update-notification { display: none !important; From 40a3b018389ed88898e7fe5e66fc854b2f58db75 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 26 Sep 2017 14:09:09 +0200 Subject: [PATCH 03/11] Fix display of Download entry text Signed-off-by: Jan-Christoph Borchardt --- apps/files_sharing/css/mobile.scss | 5 ----- apps/files_sharing/css/public.scss | 5 ++++- apps/files_sharing/templates/public.php | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/files_sharing/css/mobile.scss b/apps/files_sharing/css/mobile.scss index 8e58aa439c..00a7cd1baf 100644 --- a/apps/files_sharing/css/mobile.scss +++ b/apps/files_sharing/css/mobile.scss @@ -5,11 +5,6 @@ position: absolute !important; } -/* hide text of download button, only show icon */ -#download-text { - display: none; -} - /* hide size and date columns */ table th#headerSize, table td.filesize, diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index c87ae46b5d..ef37d785e9 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -94,6 +94,10 @@ thead { margin-right: auto; } +.download-size { + opacity: .5; +} + .directLink label { font-weight: normal; opacity: .5; @@ -129,7 +133,6 @@ thead { #remote_address { width: 200px; - margin-right: 4px; height: 31px; } diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 0c12c86da0..4e9ff1e8a6 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -55,7 +55,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
  • - t('Download'))?> () + t('Download'))?> ()
  • From 9f4cd52a970cdbb5f10f872e54b92a41f184b445 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 26 Sep 2017 17:06:10 +0200 Subject: [PATCH 04/11] Add label to download action Signed-off-by: Jan-Christoph Borchardt --- apps/files_sharing/css/public.scss | 3 +++ apps/files_sharing/templates/public.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index ef37d785e9..42013524ff 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -5,6 +5,9 @@ #header .menutoggle { padding: 14px; + padding-right: 40px; + background-position: right 15px center; + color: $color-primary-text; cursor: pointer; } diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 4e9ff1e8a6..4903ff798d 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -49,7 +49,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
    - + t('Download')) ?>