summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-05-04 14:19:12 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-05-04 15:50:30 -0500
commitccd9c4be00a1e783b6d8c821aaec2b975e4a3176 (patch)
treeae7939e0ff2e66cd8eaedd11bcbb04c917be8b35 /app/assets/stylesheets/framework
parent4ed9e5f5bebc5d3e11c21a929fdf57b8b014a31b (diff)
downloadgitlab-ce-ccd9c4be00a1e783b6d8c821aaec2b975e4a3176.tar.gz
Reduce height of nav to 50px
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r--app/assets/stylesheets/framework/nav.scss4
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss5
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
3 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 5c205ab7245..bf09b6dadc6 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 32d948e4c53..e940fd7286e 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 6c8cdcded1f..42772ff5c33 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;