summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-30 14:13:08 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-30 14:13:08 -0500
commitc44a832e459e5bce5ff0232de0846a419b51fc52 (patch)
tree92b0fe7faefbc56c45e0b053a073d53fa947bfc0
parent56ac9f3b82123e202b4f5f628b55a01ff182cf7d (diff)
downloadgitlab-ce-34153-extend-mr-tabs.tar.gz
Increase z-index on tabs holder34153-extend-mr-tabs
-rw-r--r--app/assets/stylesheets/pages/diff.scss2
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 8bde995f49c..55011e8a21b 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -474,6 +474,7 @@
height: 19px;
width: 19px;
margin-left: -15px;
+ z-index: 100;
&:hover {
.diff-comment-avatar,
@@ -540,6 +541,7 @@
height: 19px;
padding: 0;
transition: transform .1s ease-out;
+ z-index: 100;
svg {
position: absolute;
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 61717c1d362..fee939a18dd 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -731,7 +731,7 @@
.merge-request-tabs-holder {
top: $header-height;
- z-index: 100;
+ z-index: 200;
background-color: $white-light;
margin: 0 (-$gl-padding);
padding: 0 $gl-padding;