diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-20 12:11:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-20 12:11:29 +0000 |
| commit | 7b384a1f3d2608898318e67d11eea2914889ae81 (patch) | |
| tree | af33e77d13b18a96156c69616cb09a3a4f7697c6 /app/assets/stylesheets/framework | |
| parent | d46287cc16ba244720c6d5c00491944336972988 (diff) | |
| download | gitlab-ce-7b384a1f3d2608898318e67d11eea2914889ae81.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-3-stable
Diffstat (limited to 'app/assets/stylesheets/framework')
4 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss index 05ae9b1d1ed..3238b01c6c0 100644 --- a/app/assets/stylesheets/framework/contextual_sidebar.scss +++ b/app/assets/stylesheets/framework/contextual_sidebar.scss @@ -141,7 +141,7 @@ } .sidebar-top-level-items > li > a { - min-height: 45px; + min-height: 44px; } .fly-out-top-item { diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss index 13a2a74fdab..7e7b08797b2 100644 --- a/app/assets/stylesheets/framework/flash.scss +++ b/app/assets/stylesheets/framework/flash.scss @@ -12,7 +12,7 @@ $notification-box-shadow-color: rgba(0, 0, 0, 0.25); position: sticky; position: -webkit-sticky; top: $flash-container-top; - z-index: 251; + z-index: 200; .flash-content { box-shadow: 0 2px 4px 0 $notification-box-shadow-color; diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index 2289f0a7011..81ccea1e01f 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -245,7 +245,7 @@ .select2-highlighted { .group-result { .group-path { - color: $gray-800; + color: $white-light; } } } diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index b9cfcf6ce5c..43d0e51e4c9 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -171,7 +171,7 @@ position: absolute; top: $gl-padding; bottom: $gl-padding; - left: map-get($spacers, 2) - px-to-rem(1px); + left: map-get($spacers, 2) - 1px; } &-row { @@ -187,7 +187,7 @@ * 2px extra is to give a little more height than needed * to hide timeline line before/after the element starts/ends */ - height: map-get($spacers, 4) + px-to-rem(2px); + height: map-get($spacers, 4) + 2px; z-index: 1; position: relative; top: -3px; |