summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/header.scss
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-04-07 21:20:16 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-04-07 21:20:16 +0000
commitf2b7cd443566f6ceefcbecbd52c8484afe264402 (patch)
tree5d83db1c0eeefb4e7a94178b972d8f5c43b9f758 /app/assets/stylesheets/framework/header.scss
parent4361cc395cb5b9574286dee09ac55e49f394e50e (diff)
downloadgitlab-ce-f2b7cd443566f6ceefcbecbd52c8484afe264402.tar.gz
Revert "Merge branch 'new-navigation-prototype' into 'master'"
This reverts merge request !3494
Diffstat (limited to 'app/assets/stylesheets/framework/header.scss')
-rw-r--r--app/assets/stylesheets/framework/header.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 724980b2208..b3397d16016 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -123,11 +123,11 @@ header {
}
@mixin collapsed-header {
- margin-left: 40px;
+ margin-left: $sidebar_collapsed_width;
}
.header-collapsed {
- margin-left: 40px;
+ margin-left: $sidebar_collapsed_width;
@media (min-width: $screen-md-min) {
@include collapsed-header;