diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-15 14:01:38 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-15 14:01:38 +0000 |
| commit | 13176add18907a7f969a49b4b3094c74b7fdcd9f (patch) | |
| tree | c7c2b20fc8adc8234ddac46b13fe450bc07f0185 | |
| parent | 41ca924f1bfc49468004fcc37346d0dd89fb2845 (diff) | |
| download | gitlab-ce-13176add18907a7f969a49b4b3094c74b7fdcd9f.tar.gz | |
MR zindex regression
| -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 | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 2b5ab539955..018f61ca3a8 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 0173a05b403..61b13745f63 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -121,6 +121,7 @@ .dropdown-menu { margin-top: 11px; + z-index: 200; } .ci-action-icon-wrapper { @@ -690,7 +691,7 @@ .merge-request-tabs-holder { top: $header-height; - z-index: 10; + z-index: 100; background-color: $white-light; @media(min-width: $screen-sm-min) { |