diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-07 21:17:13 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-07 21:17:13 +0300 |
| commit | 4c020c8ca49c6e7a38cef86f061cc6b60e63a1bd (patch) | |
| tree | 4cd558e5bf45becc080ad337946a09438aecde79 /app/assets/stylesheets/framework/variables.scss | |
| parent | 2ef28db9a1b7d56c5dda6230dcffcf4e140ecc45 (diff) | |
| parent | b352462d01e3c51d09314c282e84afe075d6ad01 (diff) | |
Merge branch 'cleanup_old_nav_stuff' into 'master'
Remove old navigation CSS
See merge request gitlab-org/gitlab-ce!14573
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 5f604680181..bbbd16322eb 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -225,8 +225,7 @@ $gl-sidebar-padding: 22px; $row-hover: $blue-50; $row-hover-border: $blue-200; $progress-color: #c0392b; -$header-height: 50px; -$new-navbar-height: 40px; +$header-height: 40px; $fixed-layout-width: 1280px; $limited-layout-width: 990px; $limited-layout-width-sm: 790px; |