summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-13 18:16:16 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-13 18:16:16 +0000
commit7a83f2c35c768a0c21d9ec540e2355ebaec57f26 (patch)
treee4ce733af3b435f76f6349f9f11d6aaf8e964c9b
parent8ece393a1602ba9a9be5665825672641f6cb51c6 (diff)
parent7bc594735b7923d1e57eb504f09716bbb72c8c06 (diff)
downloadgitlab-ce-7a83f2c35c768a0c21d9ec540e2355ebaec57f26.tar.gz
Merge branch '17338-sidebar-width' into 'master'
Reduce width of side nav Closes #17338 Part of #14838 Left: old; Right: new <img src="/uploads/7dba5f22d6bdf1249bab5166addb25b5/Screen_Shot_2016-05-10_at_4.34.07_PM.png" width="500px"> See merge request !4109
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss2
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index bd91f51708c..f90d7a806d3 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -312,7 +312,7 @@
}
.nav-sidebar li a {
- width: 230px;
+ width: $sidebar_width;
&.back-link {
i {
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 84e74db06b0..5fa4c266607 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -2,7 +2,7 @@
* Layout
*/
$sidebar_collapsed_width: 62px;
-$sidebar_width: 230px;
+$sidebar_width: 220px;
$gutter_collapsed_width: 62px;
$gutter_width: 290px;
$gutter_inner_width: 258px;