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

Merge branch 'compact-sidebar' into 'master'
77025ad8 · Dmitriy Zaporozhets · e370ec7c · 8902253e · 77025ad8
Commit 77025ad8 authored Jul 10, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

sidebar.scss app/assets/stylesheets/generic/sidebar.scss +3 -6

No files found.
--- 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;
      }
    }