diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-10 10:41:00 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-10 12:01:51 -0500 |
| commit | cb126995aa57cc9e169f875fbd4f9b5b82575a27 (patch) | |
| tree | 0292ed332dcc2552ca9cb0f00bb8e8df3c3d3b43 /app/views/layouts/_page.html.haml | |
| parent | 9662a5e3df59216d7a3cc18b16bbf467b2233ece (diff) | |
| download | gitlab-ce-cb126995aa57cc9e169f875fbd4f9b5b82575a27.tar.gz | |
Revert side nav to full width; remove border under nav; remove tooltips on nav links; stop page content shifting with side nav; put project nav in container
Diffstat (limited to 'app/views/layouts/_page.html.haml')
| -rw-r--r-- | app/views/layouts/_page.html.haml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 6030613c8cf..c08aec959fc 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -1,8 +1,5 @@ .page-with-sidebar.page-sidebar-collapsed{ class: "#{page_gutter_class}" } .sidebar-wrapper.nicescroll{ class: nav_sidebar_class } - .gitlab-text-container - = link_to root_path, class: 'gitlab-text-container-link', title: 'Dashboard', id: 'js-shortcuts-home' do - %h3 GitLab - if defined?(sidebar) && sidebar = render "layouts/nav/#{sidebar}" @@ -18,7 +15,7 @@ = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s46' - if defined?(nav) && nav .layout-nav - .container-fluid + %div{ class: (container_class) } = render "layouts/nav/#{nav}" .content-wrapper{ class: "#{layout_nav_class}" } = render "layouts/broadcast" |