summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-10 13:16:09 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-10 13:16:09 +0200
commit0f1cf1d87b74aa1e6ca2c28fdfa21d189bd68181 (patch)
tree5707d8c5b8483629ccdf318ee9bccf0c2ff541d7
parent0c4fb72b06689c7ec92a5db93545136ec6f19417 (diff)
downloadgitlab-ce-0f1cf1d87b74aa1e6ca2c28fdfa21d189bd68181.tar.gz
Minor consistency fixes to sidebar & header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/framework/header.scss2
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 51b54ceb4bd..8190a97ed58 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -25,7 +25,7 @@ header {
padding: 0 16px;
z-index: 100;
margin-bottom: 0;
- min-height: $header-height;
+ height: $header-height;
background-color: $background-color;
border: none;
border-bottom: 1px solid $border-color;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 593f65aaf63..bd91f51708c 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -98,7 +98,7 @@
}
.sidebar-user {
- padding: 9px 22px;
+ padding: 7px 22px;
position: fixed;
bottom: 40px;
width: $sidebar_width;