diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-18 13:45:51 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-10 15:09:08 -0600 |
| commit | eefbc2bf738b9b715aad3777868d4dbeaadf612e (patch) | |
| tree | 095086a42f12a50ae0d3b61397d4033a39419144 /app/assets/stylesheets/framework/sidebar.scss | |
| parent | 060921921d920e9f4942885507a7296424ddf08c (diff) | |
| download | gitlab-ce-eefbc2bf738b9b715aad3777868d4dbeaadf612e.tar.gz | |
Fix sidebar scrolling
Diffstat (limited to 'app/assets/stylesheets/framework/sidebar.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 41e50ce7bb9..d60661222e9 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -208,7 +208,9 @@ header.header-sidebar-pinned { padding-right: 0; @media (min-width: $screen-sm-min) { - padding-right: $sidebar_collapsed_width; + .content-wrapper { + padding-right: $sidebar_collapsed_width; + } .merge-request-tabs-holder.affix { right: $sidebar_collapsed_width; @@ -234,7 +236,9 @@ header.header-sidebar-pinned { } @media (min-width: $screen-md-min) { - padding-right: $gutter_width; + .content-wrapper { + padding-right: $gutter_width; + } &:not(.with-overlay) .merge-request-tabs-holder.affix { right: $gutter_width; |