diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-14 13:14:14 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-14 13:14:14 +0000 |
| commit | e2afc1f76fce4c29901cff3a9d71577d26d80ae9 (patch) | |
| tree | 9fd70f190c93fe681d7e7e30fc33cba27bd5ccc9 | |
| parent | eb65b78a9d244c8bcdef5abc00591aaed704d0be (diff) | |
| parent | c7818ed70db953c1bde491e85252154d9cb06584 (diff) | |
| download | gitlab-ce-e2afc1f76fce4c29901cff3a9d71577d26d80ae9.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index cec52678495..d52e8f00172 100644 --- 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; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 09d3caa0e6a..f0e7002e4cd 100644 --- 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 diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 90c1fa4c87c..a1a71c2fb33 100644 --- 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}" |