summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/base/variables.scss2
-rw-r--r--app/assets/stylesheets/generic/sidebar.scss16
-rw-r--r--app/views/layouts/_page.html.haml2
3 files changed, 12 insertions, 8 deletions
diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss
index f7d4b5d1711..7f0b7fb2a62 100644
--- a/app/assets/stylesheets/base/variables.scss
+++ b/app/assets/stylesheets/base/variables.scss
@@ -12,7 +12,7 @@ $code_font_size: 13px;
$code_line_height: 1.5;
$border-color: #E7E9ED;
$background-color: #F8FAFC;
-$header-height: 67px;
+$header-height: 61px;
$fixed-layout-width: 1200px;
$gl-gray: #7f8fa4;
$gl-padding: 16px;
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index 70893759479..30e367104fe 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -127,7 +127,7 @@
width: $sidebar_collapsed_width;
a {
- padding-left: 7px;
+ padding-left: 10px;
.gitlab-text-container {
display: none;
@@ -151,8 +151,12 @@
}
.sidebar-user {
- padding-left: 7px;
+ padding-left: 10px;
width: $sidebar_collapsed_width;
+
+ .username {
+ display: none;
+ }
}
}
}
@@ -210,7 +214,7 @@
margin-left: 10px;
width: $sidebar_width - 2 * 10px;
font-size: 16px;
- line-height: 44px;
+ line-height: 36px;
}
}
@@ -231,8 +235,8 @@
overflow: hidden;
img {
- width: $gl-avatar-size;
- height: $gl-avatar-size;
+ width: 40px;
+ height: 40px;
float: left;
}
@@ -245,7 +249,7 @@
margin: 0;
margin-left: 14px;
font-size: 19px;
- line-height: 49px;
+ line-height: 41px;
font-weight: normal;
}
}
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 02ee9910dad..0814b63600d 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -14,7 +14,7 @@
= render partial: 'layouts/collapse_button'
- if current_user
= link_to current_user, class: 'sidebar-user' do
- = image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s46'
+ = image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s40'
.username
= current_user.username
.content-wrapper