summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-07-11 15:04:18 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-07-11 15:04:18 +0000
commit3239c5f666fb93cbd66cf9b1d02b8a9d6e8b0d51 (patch)
treed111f316f07df23f5f220ea8783c6fa22c9d4745
parentf020ece286699edeec1e391f3ccf4a02ed8477c7 (diff)
parent8fa19571baa913a422aa8a7501e02c23c65e5402 (diff)
downloadgitlab-ce-3239c5f666fb93cbd66cf9b1d02b8a9d6e8b0d51.tar.gz
Merge branch 'dz-sidebar-shadow' into 'master'
Add side shadow for unpinned sidebar See merge request !5167
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 188823054fd..1a2220f3b40 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -3,6 +3,12 @@
padding-bottom: 25px;
transition: padding $sidebar-transition-duration;
+ &.page-sidebar-pinned {
+ .sidebar-wrapper {
+ @include box-shadow(none);
+ }
+ }
+
.sidebar-wrapper {
position: fixed;
top: 0;
@@ -11,6 +17,7 @@
height: 100%;
overflow: hidden;
transition: width $sidebar-transition-duration;
+ @include box-shadow(2px 0 16px 0 #bbb);
}
}