From f014d31551813175e1ebf8ced61100b2db6bc02d Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Wed, 15 Aug 2018 07:30:57 +0200 Subject: 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(+) (limited to 'apps') diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss index c67d48d46fe..378f052d153 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; -- cgit v1.2.3 From a95dc4d3a7b3b976bba9353c8ec7ed72d456d458 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Wed, 15 Aug 2018 08:45:07 +0200 Subject: 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(+) (limited to 'apps') diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss index 83790c9ec4f..dca59923342 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; } } -- cgit v1.2.3 From 3d169ae4f859e54598d1f323d30df120899005aa Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Wed, 15 Aug 2018 08:46:40 +0200 Subject: 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(-) (limited to 'apps') diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss index 378f052d153..1915a953f4a 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; -- cgit v1.2.3 From 0e23193b324f0dd62369bd48709809ed03bca02c Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Wed, 15 Aug 2018 08:59:06 +0200 Subject: 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(-) (limited to 'apps') diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss index dca59923342..61a310447d3 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 8ee7412af3c..e30beee44e5 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 { -- cgit v1.2.3