summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/sidebar.scss
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/framework/sidebar.scss')
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss12
1 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 1d8e64a0e4b..c54f7b27575 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -164,6 +164,18 @@
padding-left: $sidebar_width;
}
}
+
+ .merge-request-tabs-holder.affix {
+ @media (min-width: $sidebar-breakpoint) {
+ left: $sidebar_width;
+ }
+ }
+
+ &.right-sidebar-expanded {
+ .line-resolve-all-container {
+ display: none;
+ }
+ }
}
header.header-sidebar-pinned {