diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-06-24 11:13:49 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-06-24 11:13:49 +0000 |
| commit | 9da229adc6b88b84ddef637fdbbd03ba573034ea (patch) | |
| tree | 87f8c0c26fba09a60c1c720d359ce20e5d82a47e /app | |
| parent | 81952b619b0aa22c1bc75323a26402505ea0ff76 (diff) | |
| parent | b9fc3c19f833718b15afd040103b686b15ad1994 (diff) | |
| download | gitlab-ce-9da229adc6b88b84ddef637fdbbd03ba573034ea.tar.gz | |
Merge branch 'stop-jumping' into 'master'
stop jumping all content on collapsing and expanding the sidebar
When you collapse or expand the sidebar, all content shifts with 5px.
This merge request solves that.
cc @darby
See merge request !1877
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/generic/sidebar.scss | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss index add0d1b04ad..f9abceb7f3e 100644 --- a/app/assets/stylesheets/generic/sidebar.scss +++ b/app/assets/stylesheets/generic/sidebar.scss @@ -16,7 +16,7 @@ .content-wrapper { width: 100%; - padding: 15px; + padding: 20px; background: #FFF; } @@ -96,10 +96,6 @@ width: 230px; } } - - .content-wrapper { - padding: 20px; - } } @mixin folded-sidebar { |