diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-15 14:01:39 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-18 14:27:00 +0000 |
| commit | 62ad2f429da8018472ab7fb6d269862a6118c6b2 (patch) | |
| tree | 8b70f6f56a2dbe290b08fd3f7cfacad65c9071b0 | |
| parent | 434c2517b18215e17d344e0a6b773178468e2b22 (diff) | |
| download | gitlab-ce-62ad2f429da8018472ab7fb6d269862a6118c6b2.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 746c9c25620..82b84f85a46 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -53,6 +53,7 @@ .right-sidebar-expanded { padding-right: 0; + z-index: 300; @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { &:not(.wiki-sidebar):not(.build-sidebar) .content-wrapper { diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index c4210ffd823..2b9a7e43f0f 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -206,7 +206,7 @@ transition: width .3s; background: $gray-light; padding: 10px 20px; - z-index: 2; + z-index: 200; &.right-sidebar-expanded { width: $gutter_width; diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 89cf57ee215..2cefd5e1e83 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -129,6 +129,7 @@ .dropdown-menu { margin-top: 11px; + z-index: 200; } .ci-action-icon-wrapper { @@ -703,6 +704,11 @@ } .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; &.affix { |