diff options
author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-23 18:52:19 +0000 |
---|---|---|
committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-23 18:52:19 +0000 |
commit | d2aeffce5dad2c265787cba7c967b515b00639e2 (patch) | |
tree | 923ff059ecbdffc9d7ab361210b6aaac54d9e6e1 | |
parent | e249c8da52d8a8691e161b6c67bfd1ef8a8e2d10 (diff) | |
parent | 128232fcf4e7ec7786f1ebf9610cf75ef5f76b8c (diff) | |
download | gitlab-ce-d2aeffce5dad2c265787cba7c967b515b00639e2.tar.gz |
Merge branch '28610-white-square-nav' into 'master'
Fix white square and sidebar animation
Closes #28610
See merge request !9472
-rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 040a7ce0c16..8978e284f55 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -29,16 +29,14 @@ } } -@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; } @@ -56,6 +54,12 @@ .right-sidebar-expanded { padding-right: 0; + @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { + .content-wrapper { + padding-right: $gutter_collapsed_width; + } + } + @media (min-width: $screen-md-min) { .content-wrapper { padding-right: $gutter_width; |