diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-21 19:33:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-22 12:33:28 +0100 |
| commit | 6ecabcbe95b8e53a1b870a3fddfbafa62a1146b3 (patch) | |
| tree | 28e6056021436cc6173ea45f9eedcb8c5b81c914 | |
| parent | 6e46c56b12df80b9eb1ec9130b775a77f8d65532 (diff) | |
| download | gitlab-ce-6ecabcbe95b8e53a1b870a3fddfbafa62a1146b3.tar.gz | |
Merge branch 'project-icon' into 'master'
Changing project icon
Closes #14196
See merge request !3268
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_explore.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/groups/_group.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index db0cf393922..4a0069f18f8 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -1,7 +1,7 @@ %ul.nav.nav-sidebar = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: 'home'}) do = link_to dashboard_projects_path, title: 'Projects' do - = icon('home fw') + = icon('bookmark fw') %span Projects = nav_link(controller: :todos) do diff --git a/app/views/layouts/nav/_explore.html.haml b/app/views/layouts/nav/_explore.html.haml index 48039ca2918..f08c5edf99c 100644 --- a/app/views/layouts/nav/_explore.html.haml +++ b/app/views/layouts/nav/_explore.html.haml @@ -1,7 +1,7 @@ %ul.nav.nav-sidebar = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do = link_to explore_root_path, title: 'Projects' do - = icon('home fw') + = icon('bookmark fw') %span Projects = nav_link(controller: :groups) do diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index 5bb33f90b80..28e28789a8d 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -14,7 +14,7 @@ .stats %span - = icon('home') + = icon('bookmark') = number_with_delimiter(group.projects.count) %span |