diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2017-05-19 06:05:58 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-19 06:05:58 +0000 |
| commit | c17cb4acaaffc3406ad7a784560d4bdf30a075b8 (patch) | |
| tree | 37c3b71f8719bb579808f885e542c81c6e1ffbe0 | |
| parent | 49e773b918dda642f1020d608afc5fd704fb7c44 (diff) | |
| parent | afcfbdac82d36ba919f2de8ff6885b65220ca49a (diff) | |
| download | gitlab-ce-c17cb4acaaffc3406ad7a784560d4bdf30a075b8.tar.gz | |
Merge branch '9-2-stable-fix-conflicts-for-mr-11344' into '9-2-stable'
Fix 9.2 conflicts for "MR zindex regression"
See merge request !11487
| -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 | 2 |
3 files changed, 4 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 291f629c000..0184208ab82 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -196,7 +196,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 80b07941864..2572df0bf25 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -125,6 +125,7 @@ .dropdown-menu { margin-top: 11px; + z-index: 200; } .ci-action-icon-wrapper { @@ -699,6 +700,7 @@ } .merge-request-tabs-holder { + z-index: 100; background-color: $white-light; border-bottom: 1px solid $border-color; |