diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-22 08:39:50 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-22 08:39:50 +0000 |
| commit | 26607a1690631916baf5a39d198ff7096cb5bde6 (patch) | |
| tree | fdcda42d5ee9c746b5654a50fa88a0fd1464d3a8 /app/views/layouts/nav/sidebar/_group.html.haml | |
| parent | d103e95513704314a38ab8ae441851524031c4a1 (diff) | |
| parent | 55f772bb98a67ad346442a2cacb5646f6719b987 (diff) | |
| download | gitlab-ce-26607a1690631916baf5a39d198ff7096cb5bde6.tar.gz | |
Merge branch '36231-better-svg-usage-in-the-frontend' into 'master'
Resolve "Better SVG Usage in the Frontend"
Closes #36231
See merge request gitlab-org/gitlab-ce!13435
Diffstat (limited to 'app/views/layouts/nav/sidebar/_group.html.haml')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index cb44c012f56..8cba495f7e4 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -13,7 +13,7 @@ = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do = link_to group_path(@group) do .nav-icon-container - = custom_icon('project') + = sprite_icon('project') %span.nav-item-name Overview @@ -36,7 +36,7 @@ = nav_link(path: ['groups#issues', 'labels#index', 'milestones#index']) do = link_to issues_group_path(@group) do .nav-icon-container - = custom_icon('issues') + = sprite_icon('issues') %span.nav-item-name Issues %span.badge.count= number_with_delimiter(issues.count) @@ -66,7 +66,7 @@ = nav_link(path: 'groups#merge_requests') do = link_to merge_requests_group_path(@group) do .nav-icon-container - = custom_icon('mr_bold') + = sprite_icon('git-merge') %span.nav-item-name Merge Requests %span.badge.count= number_with_delimiter(merge_requests.count) @@ -79,7 +79,7 @@ = nav_link(path: 'group_members#index') do = link_to group_group_members_path(@group) do .nav-icon-container - = custom_icon('members') + = sprite_icon('users') %span.nav-item-name Members %ul.sidebar-sub-level-items.is-fly-out-only @@ -91,7 +91,7 @@ = nav_link(path: %w[groups#projects groups#edit ci_cd#show]) do = link_to edit_group_path(@group) do .nav-icon-container - = custom_icon('settings') + = sprite_icon('settings') %span.nav-item-name Settings %ul.sidebar-sub-level-items |