Merge branch 'dz-nicer-sidebar' into 'master'

Improves left static sidebar behaviour List of changes: * removed bottom 50px space that is no longer necessary with pin button at the top * increased side padding so sidebar links are closer to counters * use fixed weight pin icon so it correctly aligned with counters cc @annabeldunstone @jschatz1 See merge request !5251

Merge branch 'dz-nicer-sidebar' into 'master'
e2afc1f7 · Dmitriy Zaporozhets · eb65b78a · c7818ed7 · e2afc1f7 · e2afc1f7
Commit e2afc1f7 authored Jul 14, 2016 by Dmitriy Zaporozhets
Showing with 4 additions and 7 deletions

sidebar.scss app/assets/stylesheets/framework/sidebar.scss +2 -6

variables.scss app/assets/stylesheets/framework/variables.scss +1 -0

_page.html.haml app/views/layouts/_page.html.haml +1 -1

No files found.
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -55,10 +55,6 @@
  overflow-y: auto;
  overflow-x: hidden;
-  @media (min-width: $sidebar-breakpoint) {
-    bottom: 50px;
-  }
  &.navbar-collapse {
    padding: 0 !important;
  }
@@ -76,7 +72,7 @@
    }
    a {
-      padding: 7px 16px;
+      padding: 7px $gl-sidebar-padding;
      font-size: $gl-font-size;
      line-height: 24px;
      display: block;
@@ -143,7 +139,7 @@
 }
 .nav-header-btn {
-  padding: 10px 16px;
+  padding: 10px $gl-sidebar-padding;
  color: inherit;
  transition-duration: .3s;
  position: absolute;

--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -64,6 +64,7 @@ $gl-btn-padding: 10px;
 $gl-input-padding: 10px;
 $gl-vert-padding: 6px;
 $gl-padding-top: 10px;
+$gl-sidebar-padding: 22px;
 /*
 * Misc

--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -6,7 +6,7 @@
        = icon('bars')
      = link_to '#', class: "nav-header-btn pin-nav-btn has-tooltip #{'is-active' if pinned_nav?} js-nav-pin", title: pinned_nav? ? "Unpin navigation" : "Pin Navigation", data: {placement: 'right', container: 'body'} do
        %span.sr-only Toggle navigation pinning
-        = icon('thumb-tack')
+        = icon('fw thumb-tack')
    - if defined?(sidebar) && sidebar
      = render "layouts/nav/#{sidebar}"