summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_requests.scss
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-10-19 14:57:42 +0100
committerPhil Hughes <me@iamphill.com>2016-10-20 19:34:35 +0100
commit4e03f4c40602b568cffd591dcd5af6bd4b9a281e (patch)
treefa7de3b03932d58d8032ded6fe927b0fd985fe0b /app/assets/stylesheets/pages/merge_requests.scss
parent672ab77bf42383a3fa90905d05b303fbe34263e8 (diff)
downloadgitlab-ce-4e03f4c40602b568cffd591dcd5af6bd4b9a281e.tar.gz
Fixed issues with sticky mr tabs & sidebar
Closes #23504
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss13
1 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 35a1877df95..70afa568554 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -183,11 +183,11 @@
.ci-coverage {
float: right;
}
-
+
.stop-env-container {
color: $gl-text-color;
float: right;
-
+
a {
color: $gl-text-color;
}
@@ -438,11 +438,18 @@
}
}
-.merge-request-tabs {
+.merge-request-tabs-holder {
background-color: #fff;
&.affix {
top: 100px;
+ left: 0;
z-index: 9;
+ transition: right .15s;
+ }
+
+ &:not(.affix) .container-fluid {
+ padding-left: 0;
+ padding-right: 0;
}
}