diff options
author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-23 12:10:35 +0300 |
---|---|---|
committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-23 12:10:35 +0300 |
commit | f106ad513546c8d77b88a0a061a0b6a7e7ee26ed (patch) | |
tree | 38dd04430133244ad6abeff8b481ba7037a9daba /app | |
parent | 176cd2ba00e97fa3c39ab892ee239ec58764c112 (diff) | |
parent | c468ad75f4dba1833b139e7949dc0fa0c75c74dc (diff) |
Merge branch '28495-content-shifting' into 'master'
Keep right padding the same whether sidebar is open or not
Closes #28495
See merge request !9422
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index d09b1c9d7f5..040a7ce0c16 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -29,14 +29,16 @@ } } +@media (min-width: $screen-sm-min) { + .content-wrapper { + padding-right: $gutter_collapsed_width; + } +} + .right-sidebar-collapsed { padding-right: 0; @media (min-width: $screen-sm-min) { - .content-wrapper { - padding-right: $gutter_collapsed_width; - } - .merge-request-tabs-holder.affix { right: $gutter_collapsed_width; } @@ -54,12 +56,6 @@ .right-sidebar-expanded { padding-right: 0; - @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { - &:not(.build-sidebar):not(.wiki-sidebar) { - padding-right: $gutter_collapsed_width; - } - } - @media (min-width: $screen-md-min) { .content-wrapper { padding-right: $gutter_width; |