summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-10 14:11:40 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-10 14:11:40 +0000
commit77025ad8e33cc99c645febe9b51fbf9931a62bcf (patch)
tree1710c54ba5ed2660046e1ba59245701b55b2b358
parente370ec7c6e1edcc1f7a1047faa5f08afcff5277a (diff)
parent8902253e0d259177a19d74ff47e12bcbdab67145 (diff)
downloadgitlab-ce-77025ad8e33cc99c645febe9b51fbf9931a62bcf.tar.gz
Merge branch 'compact-sidebar' into 'master'
Smaller font and leing height for sidebar elements Recently we added few more entries to project sidebar navigation making it overflow on laptops 1280x720 resolution now: ![Screenshot_2015-07-10_15.34.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/19f5c77e5d19cf935a4323a079020f7b/Screenshot_2015-07-10_15.34.52.png) After this fix: ![Screenshot_2015-07-10_15.34.35](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ca9cdcc2ce9c9b6aabb823ba64a3a30a/Screenshot_2015-07-10_15.34.35.png) This should help for people who use scaling with retina or owners of MacBook Air laptops cc @JobV See merge request !955
-rw-r--r--app/assets/stylesheets/generic/sidebar.scss9
1 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index 00e0534b81e..cb8ecba8dee 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -39,12 +39,12 @@
}
a {
+ padding: 7px 15px;
+ font-size: 13px;
+ line-height: 18px;
color: $gray;
display: block;
text-decoration: none;
- padding: 8px 15px;
- font-size: 14px;
- line-height: 20px;
padding-left: 16px;
&:hover {
@@ -114,9 +114,6 @@
width: $sidebar_collapsed_width;
li a {
- font-size: 14px;
- padding: 8px 15px;
- text-align: left;
padding-left: 16px;
}
}