diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-15 19:35:37 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-15 19:35:37 +0100 |
| commit | 7886692147ac76e749729505ab368782e76f174e (patch) | |
| tree | 2b4f2ccc7bff351679c00057711d12586a8a4535 /app/views | |
| parent | 7d9157ff47c1380492a64aa3c7a1e1a7fa6b8e37 (diff) | |
| download | gitlab-ce-7886692147ac76e749729505ab368782e76f174e.tar.gz | |
Moved pinned button to the bottom
Changed breakpoint width to 1440px
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/_collapse_button.html.haml | 5 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/views/layouts/_collapse_button.html.haml b/app/views/layouts/_collapse_button.html.haml index 5442ee4efe3..8c140a5943e 100644 --- a/app/views/layouts/_collapse_button.html.haml +++ b/app/views/layouts/_collapse_button.html.haml @@ -1,6 +1,3 @@ -= link_to '#', class: 'nav-header-btn toggle-nav-collapse', title: "Open/Close" do += link_to '#', class: 'nav-header-btn text-center toggle-nav-collapse', title: "Open/Close" do %span.sr-only Toggle navigation = icon('bars') -= link_to '#', class: "nav-header-btn pin-nav-btn #{'is-active' if pinned_nav?} visible-lg-block js-nav-pin", title: 'Pin/Unpin navigation' do - %span.sr-only Toggle navigation pinning - = icon('thumb-tack') diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 90e872c461d..199ab3c38c3 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -1,7 +1,6 @@ .page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" } .sidebar-wrapper.nicescroll{ class: nav_sidebar_class } - %header.collapse-nav - = render partial: 'layouts/collapse_button' + = render partial: 'layouts/collapse_button' - if defined?(sidebar) && sidebar = render "layouts/nav/#{sidebar}" - elsif current_user @@ -14,6 +13,9 @@ = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36' .username = current_user.username + = link_to '#', class: "nav-header-btn text-center pin-nav-btn #{'is-active' if pinned_nav?} js-nav-pin", title: 'Pin/Unpin navigation' do + %span.sr-only Toggle navigation pinning + = icon('thumb-tack') - if defined?(nav) && nav .layout-nav .container-fluid |