diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-17 17:33:12 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-18 13:37:43 -0500 |
| commit | cb83c50d4663532b5b1729b27301d22102c17524 (patch) | |
| tree | 7e13b20323c6317a90851df737b21035003bdcf6 /app/views | |
| parent | fe0c3b79d92348f54c61b81635be65f895d2f712 (diff) | |
| download | gitlab-ce-cb83c50d4663532b5b1729b27301d22102c17524.tar.gz | |
Add mobile navigation on project page
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/nav/_breadcrumbs.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_project_sidebar.html.haml | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app/views/layouts/nav/_breadcrumbs.html.haml b/app/views/layouts/nav/_breadcrumbs.html.haml index b0c1ab7420f..475d89f1156 100644 --- a/app/views/layouts/nav/_breadcrumbs.html.haml +++ b/app/views/layouts/nav/_breadcrumbs.html.haml @@ -3,6 +3,8 @@ %nav.breadcrumbs{ role: "navigation" } .breadcrumbs-container{ class: [container_class, @content_class] } + %button.toggle-mobile-nav + = icon ('bars') .breadcrumbs-links.js-title-container - unless hide_top_links .title diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml index 7c9822c5a6a..baf257d06e0 100644 --- a/app/views/layouts/nav/_new_project_sidebar.html.haml +++ b/app/views/layouts/nav/_new_project_sidebar.html.haml @@ -1,10 +1,13 @@ .nav-sidebar - can_edit = can?(current_user, :admin_project, @project) - = link_to project_path(@project), title: @project.name, class: 'context-header' do - .avatar-container.s40.project-avatar - = project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile') - .project-title - = @project.name + .context-header + = link_to project_path(@project), title: @project.name do + .avatar-container.s40.project-avatar + = project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile') + .project-title + = @project.name + %button.close-nav-button + = icon('times') %ul.sidebar-top-level-items = nav_link(path: ['projects#show', 'projects#activity', 'cycle_analytics#show'], html_options: { class: 'home' }) do = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do |