diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-26 09:32:07 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-26 09:32:07 -0500 |
| commit | 08ec838ed501473846806be2680e8888ff859e10 (patch) | |
| tree | 4a4664c505d667db907084bd8850cd689f338f7e /app/assets/stylesheets/framework/header.scss | |
| parent | b2dcfc4db3828888f9aa0a9cc38e89fe84d30b2c (diff) | |
| parent | f150b8a5b9a6f56151523061813bad2cf48c9d91 (diff) | |
| download | gitlab-ce-08ec838ed501473846806be2680e8888ff859e10.tar.gz | |
Merge branch 'master' into avatar-croppingavatar-cropping
Diffstat (limited to 'app/assets/stylesheets/framework/header.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 531dedb89fe..e624982c5c9 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -142,9 +142,13 @@ header { } @media (max-width: $screen-md-max) { - .header-collapsed, .header-expanded { - @include collapsed-header; + .header-collapsed { + margin-left: $sidebar_collapsed_width; } + + .header-expanded { + margin-left: $sidebar_width; + } } @media(min-width: $screen-md-max) { |