summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-02-23 15:15:24 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-02-23 15:24:49 -0500
commitc684bcc8b7b9361e65197841db69d82176206b88 (patch)
treea9de5b0a21a370e778e6a81e67b6b41b15387d7a /app
parent13047483b3180c0966fffdb60dfe687820a72818 (diff)
downloadgitlab-ce-c684bcc8b7b9361e65197841db69d82176206b88.tar.gz
Fixes padding when right sidebar is not present
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 194bd803930..e2b978b50bd 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -12,6 +12,10 @@
height: 100%;
transition-duration: .3s;
}
+
+ &.right-sidebar-expanded {
+ padding-right: $gutter_width;
+ }
}
.sidebar-wrapper {
@@ -179,6 +183,9 @@
}
@mixin expanded-sidebar {
+ &.right-sidebar-collapsed {
+ padding-right: $sidebar_collapsed_width;
+ }
// when the screen is small enough
@media (max-width: $screen-md-max) {
@@ -212,6 +219,10 @@
@mixin collapsed-sidebar {
padding-left: $sidebar_collapsed_width;
+ &.right-sidebar-collapsed {
+ padding-right: $sidebar_collapsed_width;
+ }
+
.sidebar-wrapper {
width: $sidebar_collapsed_width;