From f014d31551813175e1ebf8ced61100b2db6bc02d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 15 Aug 2018 07:30:57 +0200 Subject: [PATCH 1/5] Undo button fix in theming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/theming/css/settings-admin.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss index c67d48d46fe2d..378f052d1536e 100644 --- a/apps/theming/css/settings-admin.scss +++ b/apps/theming/css/settings-admin.scss @@ -26,6 +26,8 @@ vertical-align: top; display: inline-block; visibility: hidden; + height: 32px; + width: 32px; } form.uploadButton { width: 411px; From 5e867d6415591be62e101306a42b48eeeaaa3489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 15 Aug 2018 08:11:13 +0200 Subject: [PATCH 2/5] Fix footer and public min-height MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/public.scss | 25 +++++++++++++++++++++++-- core/css/styles.scss | 19 ------------------- core/templates/layout.public.php | 2 +- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/core/css/public.scss b/core/css/public.scss index 0c04b07ab090f..a4e7ed579b9f7 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -1,3 +1,5 @@ +$footer-height: 60px; + #body-public { .header-right { @@ -36,8 +38,9 @@ } #content { - height: initial; - min-height: calc(100vh - 160px); + // 100% - footer + min-height: calc(100% - #{$footer-height}); + } /** don't apply content header padding on the base layout */ @@ -64,4 +67,22 @@ form input[type='checkbox']+label { text-align: center; } + + /* public footer */ + footer { + position: relative; + display: flex; + align-items: center; + justify-content: center; + height: $footer-height; + p { + color: var(--color-text-lighter); + a { + color: var(--color-text-lighter); + font-weight: 600; + padding: 13px; + margin: -13px; + } + } + } } diff --git a/core/css/styles.scss b/core/css/styles.scss index ad82a7acbf79f..d1b43a3281fa0 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -1049,25 +1049,6 @@ div.crumb { } } -/* public footer */ - -#body-public footer { - position: relative; - text-align: center; - .info { - color: var(--color-text-lighter); - text-align: center; - margin: 0 auto; - padding: 20px 0; - a { - color: var(--color-text-lighter); - font-weight: 600; - padding: 13px; - margin: -13px; - } - } -} - /* LEGACY FIX only - do not use fieldsets for settings */ fieldset { diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php index 74ce43d4f8884..13baf19401083 100644 --- a/core/templates/layout.public.php +++ b/core/templates/layout.public.php @@ -78,7 +78,7 @@ getFooterVisible()) { ?>
-

getLongFooter()); ?>

+

getLongFooter()); ?>

From a95dc4d3a7b3b976bba9353c8ec7ed72d456d458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 15 Aug 2018 08:45:07 +0200 Subject: [PATCH 3/5] Ellipsis long username/mails in share view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_sharing/css/sharetabview.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss index 83790c9ec4fec..dca59923342ac 100644 --- a/apps/files_sharing/css/sharetabview.scss +++ b/apps/files_sharing/css/sharetabview.scss @@ -168,6 +168,7 @@ margin-left: auto; display: flex; align-items: center; + white-space: nowrap; // can edit label > .shareOption > label { padding: 13px; @@ -196,6 +197,9 @@ } .username { padding: 0 8px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } } From 3d169ae4f859e54598d1f323d30df120899005aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 15 Aug 2018 08:46:40 +0200 Subject: [PATCH 4/5] Typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/theming/css/settings-admin.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss index 378f052d1536e..1915a953f4a68 100644 --- a/apps/theming/css/settings-admin.scss +++ b/apps/theming/css/settings-admin.scss @@ -27,7 +27,7 @@ display: inline-block; visibility: hidden; height: 32px; - width: 32px; + width: 32px; } form.uploadButton { width: 411px; From 0e23193b324f0dd62369bd48709809ed03bca02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 15 Aug 2018 08:59:06 +0200 Subject: [PATCH 5/5] Added feedback on autocomplete ui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_sharing/css/sharetabview.scss | 2 +- core/css/jquery-ui-fixes.scss | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss index dca59923342ac..61a310447d3ea 100644 --- a/apps/files_sharing/css/sharetabview.scss +++ b/apps/files_sharing/css/sharetabview.scss @@ -205,7 +205,7 @@ .ui-autocomplete { /* limit dropdown height to 4 1/2 entries */ - max-height: 200px; + max-height: calc(36px * 4.5);; overflow-y: auto; overflow-x: hidden; z-index: 1550 !important; diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss index 8ee7412af3c51..e30beee44e5c1 100644 --- a/core/css/jquery-ui-fixes.scss +++ b/core/css/jquery-ui-fixes.scss @@ -173,6 +173,7 @@ .ui-menu-item a { &.ui-state-focus, &.ui-state-active { font-weight: inherit; + box-shadow: inset 4px 0 var(--color-primary); } } } @@ -184,15 +185,25 @@ &.ui-corner-all { border-radius: 0; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; + border-bottom-left-radius: var(--border-radius); + border-bottom-right-radius: var(--border-radius); } - .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { + .ui-state-hover, .ui-widget-content .ui-state-hover, + .ui-widget-header .ui-state-hover, + .ui-state-focus, + .ui-widget-content .ui-state-focus, + .ui-widget-header .ui-state-focus { border: 1px solid transparent; background: inherit; color: var(--color-primary-element); } + + .ui-menu-item { + a { + border-radius: 0 !important; + } + } } .ui-button.primary {