BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 62ad2f42 by Annabel Dunstone Gray Committed by Timothy Andrew
Options

Merge branch 'fix-merge-request-show-component-z-indices' into 'master'

MR zindex regression Closes #32216 See merge request !11344 Conflicts: app/assets/stylesheets/pages/merge_requests.scss
parent 434c2517
Showing with 8 additions and 1 deletion
app/assets/stylesheets/framework/sidebar.scss
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
.right-sidebar-expanded { .right-sidebar-expanded {
padding-right: 0; padding-right: 0;
z-index: 300;
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
&:not(.wiki-sidebar):not(.build-sidebar) .content-wrapper { &:not(.wiki-sidebar):not(.build-sidebar) .content-wrapper {
......
app/assets/stylesheets/pages/issuable.scss
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
transition: width .3s; transition: width .3s;
background: $gray-light; background: $gray-light;
padding: 10px 20px; padding: 10px 20px;
z-index: 2; z-index: 200;
&.right-sidebar-expanded { &.right-sidebar-expanded {
width: $gutter_width; width: $gutter_width;
......
app/assets/stylesheets/pages/merge_requests.scss
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
.dropdown-menu { .dropdown-menu {
margin-top: 11px; margin-top: 11px;
z-index: 200;
} }
.ci-action-icon-wrapper { .ci-action-icon-wrapper {
...@@ -703,6 +704,11 @@ ...@@ -703,6 +704,11 @@
} }
.merge-request-tabs-holder { .merge-request-tabs-holder {
<<<<<<< HEAD
=======
top: $header-height;
z-index: 100;
>>>>>>> 3460f36... Merge branch 'fix-merge-request-show-component-z-indices' into 'master'
background-color: $white-light; background-color: $white-light;
&.affix { &.affix {
......
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