diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-29 17:22:56 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-29 17:22:56 +0000 |
| commit | 5906a256316b68a6b5d5457338b1ef583b494b22 (patch) | |
| tree | 86fec29fe0e3f09b488d585593e16c14c7db129c /app/assets | |
| parent | b351a77a52954832470a1adc05228e444ed0f651 (diff) | |
| parent | f31bf3d7def3b6d93163558535d63496d7111ff4 (diff) | |
| download | gitlab-ce-5906a256316b68a6b5d5457338b1ef583b494b22.tar.gz | |
Merge branch '29830-build-scroll-indicator' into 'master'
don't pad hidden sidebar on build and wiki pages
Closes #29830
See merge request !10199
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 40e93032f59..746c9c25620 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -33,7 +33,7 @@ padding-right: 0; @media (min-width: $screen-sm-min) { - .content-wrapper { + &:not(.wiki-sidebar):not(.build-sidebar) .content-wrapper { padding-right: $gutter_collapsed_width; } @@ -55,7 +55,7 @@ padding-right: 0; @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { - .content-wrapper { + &:not(.wiki-sidebar):not(.build-sidebar) .content-wrapper { padding-right: $gutter_collapsed_width; } } |