diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-03-24 11:31:28 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-03-24 11:31:28 +1100 |
| commit | f31bf3d7def3b6d93163558535d63496d7111ff4 (patch) | |
| tree | 0aebb069cf73a23c8914d33f45cf31ef4ddf20c2 | |
| parent | bcbd03257aa52641ee165405b90efd6f53cf8f38 (diff) | |
| download | gitlab-ce-f31bf3d7def3b6d93163558535d63496d7111ff4.tar.gz | |
don't pad hidden sidebar on build and wiki pages
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/29830-build-scroll-indicator.yml | 4 |
2 files changed, 6 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; } } diff --git a/changelogs/unreleased/29830-build-scroll-indicator.yml b/changelogs/unreleased/29830-build-scroll-indicator.yml new file mode 100644 index 00000000000..e899a828de7 --- /dev/null +++ b/changelogs/unreleased/29830-build-scroll-indicator.yml @@ -0,0 +1,4 @@ +--- +title: fix sidebar padding for build and wiki pages +merge_request: +author: |