diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-27 14:21:27 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-27 15:41:00 -0500 |
| commit | b0370705614e80fb815fc2874881d0ceb8877dd6 (patch) | |
| tree | a2c883f0ddf23a997779bccefc1fd151736be562 | |
| parent | fa96130250b733abf31f6d367d7c5cfcdc5daaf4 (diff) | |
| download | gitlab-ce-34023-navigation-sidebar.tar.gz | |
Fix karma specs34023-navigation-sidebar
| -rw-r--r-- | app/assets/stylesheets/new_sidebar.scss | 2 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_admin_sidebar.html.haml | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss index c2483691ee4..06c6025ed6b 100644 --- a/app/assets/stylesheets/new_sidebar.scss +++ b/app/assets/stylesheets/new_sidebar.scss @@ -4,7 +4,7 @@ $new-sidebar-width: 220px; -.page-with-sidebar { +.page-with-new-sidebar { @media (min-width: $screen-sm-min) { padding-left: $new-sidebar-width; diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index f65daed72b1..62a76a1b00e 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -1,4 +1,4 @@ -%div{ class: "#{('page-with-sidebar' if defined?(@new_sidebar) && @new_sidebar)} #{page_gutter_class}" } +.page-with-sidebar{ class: "#{('page-with-new-sidebar' if defined?(@new_sidebar) && @new_sidebar)} #{page_gutter_class}" } - if show_new_nav? - if defined?(nav) && nav = render "layouts/nav/#{nav}" diff --git a/app/views/layouts/nav/_new_admin_sidebar.html.haml b/app/views/layouts/nav/_new_admin_sidebar.html.haml index 151e0e8f958..f995145917c 100644 --- a/app/views/layouts/nav/_new_admin_sidebar.html.haml +++ b/app/views/layouts/nav/_new_admin_sidebar.html.haml @@ -1,5 +1,4 @@ .nav-sidebar - -# = render 'layouts/nav/admin_settings' %ul.sidebar-top-level-items = nav_link(controller: %w(dashboard admin projects users groups builds runners cohorts), html_options: {class: 'home'}) do = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do |