diff options
author | Mike Greiling <mike@pixelcog.com> | 2016-09-02 10:34:04 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2016-09-07 14:02:21 -0500 |
commit | a510fe11026ddfd264b9cc4627541b6dac0c38c7 (patch) | |
tree | 8c637f72ee7423cf14137e124dccd1404e8caba6 /app/assets/stylesheets/framework/sidebar.scss | |
parent | b2f8ebbb4295e5f070187050e094db87ff9d6ad0 (diff) | |
download | gitlab-ce-a510fe11026ddfd264b9cc4627541b6dac0c38c7.tar.gz |
remove superfluous "collapsed" class and rename header classes for clarity
Diffstat (limited to 'app/assets/stylesheets/framework/sidebar.scss')
-rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 558a5fb5d25..3b7de4b57bb 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -1,6 +1,5 @@ .page-with-sidebar { - padding-top: $header-height; - padding-bottom: 25px; + padding: $header-height 0 25px; transition: padding $sidebar-transition-duration; &.page-sidebar-pinned { @@ -15,6 +14,7 @@ bottom: 0; left: 0; height: 100%; + width: 0; overflow: hidden; transition: width $sidebar-transition-duration; @include box-shadow(2px 0 16px 0 $black-transparent); @@ -150,14 +150,6 @@ } } -.page-sidebar-collapsed { - padding-left: 0; - - .sidebar-wrapper { - width: 0; - } -} - .page-sidebar-expanded { .sidebar-wrapper { width: $sidebar_width; @@ -173,7 +165,7 @@ } } -header.header-pinned-nav { +header.header-sidebar-pinned { @media (min-width: $sidebar-breakpoint) { padding-left: ($sidebar_width + $gl-padding); |