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

Merge branch 'header-icons' into 'master'
72f18898 · Dmitriy Zaporozhets · 492249f9 · 6cf45dde · 72f18898
Commit 72f18898 authored May 28, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

_head_panel.html.haml app/views/layouts/_head_panel.html.haml +2 -2

No files found.
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -30,13 +30,13 @@
        - if current_user.is_admin?
          %li
            = link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('cogs')
+              = icon('wrench')
        - if current_user.can_create_project?
          %li
            = link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do
              = icon('plus')
        %li
          = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
-            = icon('user')
+            = icon('cog')
 = render 'shared/outdated_browser'