diff options
author | Phil Hughes <me@iamphill.com> | 2017-04-06 14:27:48 +0100 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2017-04-06 18:14:42 -0400 |
commit | 518203d5e181d9f5fdf5c4fd40635b076babbe57 (patch) | |
tree | f2b3126088400310a6e3bee9efb233ce414154e1 /app/views/layouts | |
parent | 7eba42f5c08637eb0d46b40da62825981d0c7247 (diff) | |
download | gitlab-ce-518203d5e181d9f5fdf5c4fd40635b076babbe57.tar.gz |
Fixed specs
Updated JS that was causing the hints to appear & then disappear
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 2f8d722c58a..444ecc414c0 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -2,13 +2,17 @@ = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do .shortcut-mappings - .key shift p + .key + = icon('arrow-up', 'aria-label' => 'hidden') + P %span Projects = nav_link(path: 'dashboard#activity') do = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do .shortcut-mappings - .key shift a + .key + = icon('arrow-up', 'aria-label' => 'hidden') + A %span Activity - if koding_enabled? @@ -19,33 +23,43 @@ = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do = link_to dashboard_groups_path, class: 'dashboard-shortcuts-groups', title: 'Groups' do .shortcut-mappings - .key shift g + .key + = icon('arrow-up', 'aria-label' => 'hidden') + G %span Groups = nav_link(controller: 'dashboard/milestones') do = link_to dashboard_milestones_path, class: 'dashboard-shortcuts-milestones', title: 'Milestones' do .shortcut-mappings - .key shift l + .key + = icon('arrow-up', 'aria-label' => 'hidden') + L %span Milestones = nav_link(path: 'dashboard#issues') do = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do .shortcut-mappings - .key shift i + .key + = icon('arrow-up', 'aria-label' => 'hidden') + I %span Issues .badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened)) = nav_link(path: 'dashboard#merge_requests') do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do .shortcut-mappings - .key shift m + .key + = icon('arrow-up', 'aria-label' => 'hidden') + M %span Merge Requests .badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened)) = nav_link(controller: 'dashboard/snippets') do = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do .shortcut-mappings - .key shift s + .key + = icon('arrow-up', 'aria-label' => 'hidden') + S %span Snippets %li.divider |