diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-23 07:54:26 -0600 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-23 07:54:26 -0600 |
commit | 128232fcf4e7ec7786f1ebf9610cf75ef5f76b8c (patch) | |
tree | 04f4a31b0cdaf8dc8665ed927dea0f6035be4997 /app/assets | |
parent | a77b40d45e2f474a3d2401125b7b89379a7a7dd5 (diff) | |
download | gitlab-ce-128232fcf4e7ec7786f1ebf9610cf75ef5f76b8c.tar.gz |
Fix white square and sidebar animation28610-white-square-nav
Diffstat (limited to 'app/assets')
-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; |