summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/sidebar.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/framework/sidebar.scss
parent672ab77bf42383a3fa90905d05b303fbe34263e8 (diff)
downloadgitlab-ce-4e03f4c40602b568cffd591dcd5af6bd4b9a281e.tar.gz
Fixed issues with sticky mr tabs & sidebar
Closes #23504
Diffstat (limited to 'app/assets/stylesheets/framework/sidebar.scss')
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index ec52f326eb9..1d8e64a0e4b 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -185,6 +185,10 @@ header.header-sidebar-pinned {
@media (min-width: $screen-sm-min) {
padding-right: $sidebar_collapsed_width;
+
+ .merge-request-tabs-holder.affix {
+ right: $sidebar_collapsed_width;
+ }
}
.sidebar-collapsed-icon {
@@ -207,6 +211,10 @@ header.header-sidebar-pinned {
@media (min-width: $screen-md-min) {
padding-right: $gutter_width;
+
+ .merge-request-tabs-holder.affix {
+ right: $gutter_width;
+ }
}
&.with-overlay {