Commit 37b0dc4f authored by Mark Florian's avatar Mark Florian

Merge branch 'master' into 'master'

Changed the values of z-index

See merge request gitlab-org/gitlab!51135
parents cc6daea3 ec9429c6
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
left: 0; left: 0;
width: 100%; width: 100%;
background: $white; background: $white;
z-index: 300; z-index: $zindex-dropdown-menu;
padding: 7px 0 6px; // to keep aligned with "collapse sidebar" button on the left sidebar padding: 7px 0 6px; // to keep aligned with "collapse sidebar" button on the left sidebar
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
padding-left: $contextual-sidebar-width; padding-left: $contextual-sidebar-width;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
top: 0; top: 0;
margin-top: 3px; margin-top: 3px;
padding: $gl-padding; padding: $gl-padding;
z-index: 300; z-index: $zindex-dropdown-menu;
width: $award-emoji-width; width: $award-emoji-width;
font-size: 14px; font-size: 14px;
background-color: $white; background-color: $white;
......
...@@ -471,7 +471,7 @@ ...@@ -471,7 +471,7 @@
background-color: $black-transparent; background-color: $black-transparent;
height: 100%; height: 100%;
width: 100%; width: 100%;
z-index: 300; z-index: $zindex-dropdown-menu;
} }
} }
} }
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
position: absolute; position: absolute;
width: auto; width: auto;
top: 100%; top: 100%;
z-index: 300; z-index: $zindex-dropdown-menu;
min-width: 240px; min-width: 240px;
max-width: 500px; max-width: 500px;
margin-top: $dropdown-vertical-offset; margin-top: $dropdown-vertical-offset;
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
.right-sidebar-expanded { .right-sidebar-expanded {
padding-right: 0; padding-right: 0;
z-index: 300; z-index: $zindex-dropdown-menu;
@include media-breakpoint-only(sm) { @include media-breakpoint-only(sm) {
&:not(.wiki-sidebar):not(.build-sidebar):not(.issuable-bulk-update-sidebar) .content-wrapper { &:not(.wiki-sidebar):not(.build-sidebar):not(.issuable-bulk-update-sidebar) .content-wrapper {
......
...@@ -433,6 +433,7 @@ $browser-scrollbar-size: 10px; ...@@ -433,6 +433,7 @@ $browser-scrollbar-size: 10px;
*/ */
$header-height: 40px; $header-height: 40px;
$header-zindex: 1000; $header-zindex: 1000;
$zindex-dropdown-menu: 300;
$suggestion-header-height: 46px; $suggestion-header-height: 46px;
$ide-statusbar-height: 25px; $ide-statusbar-height: 25px;
$fixed-layout-width: 1280px; $fixed-layout-width: 1280px;
......
...@@ -221,7 +221,7 @@ $mr-widget-min-height: 69px; ...@@ -221,7 +221,7 @@ $mr-widget-min-height: 69px;
.mr-widget-pipeline-graph { .mr-widget-pipeline-graph {
.dropdown-menu { .dropdown-menu {
z-index: 300; z-index: $zindex-dropdown-menu;
} }
} }
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
// This utility is used to force the z-index to match that of dropdown menu's // This utility is used to force the z-index to match that of dropdown menu's
.gl-z-dropdown-menu\! { .gl-z-dropdown-menu\! {
z-index: 300 !important; z-index: $zindex-dropdown-menu !important;
} }
.gl-flex-basis-quarter { .gl-flex-basis-quarter {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment