diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-21 19:33:57 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-21 19:33:57 +0000 |
| commit | 16b44f718429ff8671c097ea2898046714054eda (patch) | |
| tree | e7447c972ab14123e4bc6411fb584d6cd0dc3c08 | |
| parent | e210438eacc50b819774ba257acb2687f45bf827 (diff) | |
| parent | debc882cad5d42412ad1ee72e50a4a20c8dd4414 (diff) | |
| download | gitlab-ce-16b44f718429ff8671c097ea2898046714054eda.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 f172350f5ff..ec8763f4bd7 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 |