From 67cbfa74ab3d22f1e2b6a4276871bf3b94a54e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 3 Oct 2018 12:10:18 +0200 Subject: [PATCH 1/2] Fix sticky header on users list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- settings/css/settings.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings/css/settings.scss b/settings/css/settings.scss index ae1a456b699fd..5be36c86d02cf 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -1428,7 +1428,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { align-self: normal; background-color: var(--color-main-background); z-index: 55; /* above multiselect */ - top: 0; + top: $header-height; &.sticky { box-shadow: 0 -2px 10px 1px var(--color-box-shadow); } @@ -1441,9 +1441,9 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { z-index: 0; } } - // separate prop to set initial value to top:0 + // separate prop to set initial value to top: 50px &#new-user { - top: $grid-row-height; + top: $header-height + $grid-row-height; } &#grid-header { color: var(--color-text-maxcontrast); From ee446ba2acbd721f21db8f4955b786097e7e96f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 3 Oct 2018 21:55:40 +0200 Subject: [PATCH 2/2] Border fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- settings/css/settings.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 5be36c86d02cf..e670da7d3283a 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -1394,7 +1394,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { /* let's define the column until storage path, what follows will be manually defined */ grid-template-columns: 44px minmax(150px, 1fr) repeat(auto-fit, minmax(120px, 1fr)); - border-top: var(--color-border) 1px solid; + border-bottom: var(--color-border) 1px solid; &.disabled { opacity: .5; }