Commit 72f18898 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'header-icons' into 'master'

Change some header icons

icons changed:

* profile settings: user icon to cog
* admin area: cogs to wrench

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/719#note_1289290

![Screenshot_2015-05-27_17.58.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/762de4afb8ae229a96ead8b2d213b2a4/Screenshot_2015-05-27_17.58.12.png)

See merge request !726
parents 492249f9 6cf45dde
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
- if current_user.is_admin? - if current_user.is_admin?
%li %li
= link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('cogs') = icon('wrench')
- if current_user.can_create_project? - if current_user.can_create_project?
%li %li
= link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('plus') = icon('plus')
%li %li
= link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('user') = icon('cog')
= render 'shared/outdated_browser' = render 'shared/outdated_browser'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment