diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-07 19:40:17 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-07 19:40:17 +0300 |
| commit | b12107a0b953b566cd58db30ae880800a4a695a6 (patch) | |
| tree | 65925904b02f5a62f86255759084b5edf2e95cbf /app/views/layouts | |
| parent | f8d34ab5abc049e42573992c9fa05246b323cd20 (diff) | |
| parent | 1c184ed9e2e34e42e3c3e5a3fb9e735fcf12c4dd (diff) | |
Merge branch '34028-collapse-sidebar' into 'master'
Resolve "Navigation - Make contextual sidebar collapsible"
Closes #34028
See merge request !13281
Diffstat (limited to 'app/views/layouts')
4 files changed, 8 insertions, 0 deletions
diff --git a/app/views/layouts/nav/_new_admin_sidebar.html.haml b/app/views/layouts/nav/_new_admin_sidebar.html.haml index 54ea39a2d36..06cfa509ebf 100644 --- a/app/views/layouts/nav/_new_admin_sidebar.html.haml +++ b/app/views/layouts/nav/_new_admin_sidebar.html.haml @@ -149,3 +149,5 @@ = custom_icon('settings') %span.nav-item-name Settings + + = render 'shared/sidebar_toggle_button' diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index 1fc92765c40..4a04b27b3d9 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -88,3 +88,5 @@ = link_to group_settings_ci_cd_path(@group), title: 'CI / CD' do %span CI / CD + + = render 'shared/sidebar_toggle_button' diff --git a/app/views/layouts/nav/_new_profile_sidebar.html.haml b/app/views/layouts/nav/_new_profile_sidebar.html.haml index f715d8a63f9..df869fef604 100644 --- a/app/views/layouts/nav/_new_profile_sidebar.html.haml +++ b/app/views/layouts/nav/_new_profile_sidebar.html.haml @@ -83,3 +83,5 @@ = custom_icon('authentication_log') %span.nav-item-name Authentication log + + = render 'shared/sidebar_toggle_button' diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml index e8fde923134..4b7209fa69e 100644 --- a/app/views/layouts/nav/_new_project_sidebar.html.haml +++ b/app/views/layouts/nav/_new_project_sidebar.html.haml @@ -222,6 +222,8 @@ %span Members + = render 'shared/sidebar_toggle_button' + -# Shortcut to Project > Activity %li.hidden = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do |