summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-02 13:24:35 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-02 21:57:33 +0200
commitb879407695f71a11cbc69a24623a71e0e2ff6e92 (patch)
tree090752aa2536ba3ce5f726b84cd37b68ed6b67ff
parent4406aeff05ea76522e662c996cbb9c9837f765d4 (diff)
downloadgitlab-ce-b879407695f71a11cbc69a24623a71e0e2ff6e92.tar.gz
Fix collapsed sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/base/variables.scss2
-rw-r--r--app/assets/stylesheets/generic/sidebar.scss10
2 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss
index f492530a137..81c1ab1c385 100644
--- a/app/assets/stylesheets/base/variables.scss
+++ b/app/assets/stylesheets/base/variables.scss
@@ -5,7 +5,7 @@ $gl-link-color: #446e9b;
$nprogress-color: #c0392b;
$gl-font-size: 14px;
$list-font-size: 15px;
-$sidebar_collapsed_width: 52px;
+$sidebar_collapsed_width: 62px;
$sidebar_width: 230px;
$avatar_radius: 50%;
$code_font_size: 13px;
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index 160520d5e89..603aef79d0e 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -124,20 +124,26 @@
.sidebar-wrapper {
width: $sidebar_collapsed_width;
+ .header-logo a {
+ padding-left: 7px;
+ }
+
.nav-sidebar {
width: $sidebar_collapsed_width;
- li a {
- padding-left: 16px;
+ li a i {
+ margin-right: 20px;
}
}
.collapse-nav a {
left: 0px;
+ opacity: 0.6;
width: $sidebar_collapsed_width;
}
.sidebar-user {
+ padding-left: 7px;
width: $sidebar_collapsed_width;
}
}