From ccd9c4be00a1e783b6d8c821aaec2b975e4a3176 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Wed, 4 May 2016 14:19:12 -0500 Subject: [PATCH] Reduce height of nav to 50px --- app/assets/stylesheets/framework/nav.scss | 4 ++-- app/assets/stylesheets/framework/sidebar.scss | 5 +++-- app/assets/stylesheets/framework/variables.scss | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 5c205ab724..bf09b6dadc 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -194,7 +194,7 @@ .layout-nav { position: fixed; - top: 58px; + top: $header-height; width: 100%; z-index: 1; background: $background-color; @@ -271,5 +271,5 @@ } .page-with-layout-nav { - margin-top: 52px; + margin-top: 50px; } diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 32d948e4c5..e940fd7286 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -3,6 +3,7 @@ position: absolute; width: 58px; cursor: pointer; + margin-top: 8px; } .page-with-sidebar { @@ -62,7 +63,7 @@ float: left; height: $header-height; width: 100%; - padding: 11px 0 11px 22px; + padding-left: 22px; overflow: hidden; outline: none; transition-duration: .3s; @@ -85,7 +86,7 @@ margin: 0; margin-left: 50px; font-size: 19px; - line-height: 41px; + line-height: 50px; font-weight: normal; } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 6c8cdcded1..42772ff5c3 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -65,7 +65,7 @@ $gl-padding-top: 10px; $row-hover: #f4f8fe; $progress-color: #c0392b; $avatar_radius: 50%; -$header-height: 58px; +$header-height: 50px; $fixed-layout-width: 1280px; $gl-avatar-size: 40px; $error-exclamation-point: #e62958;