Commit 4ff5c7c3 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'fix/font-awesome' into 'master'

Fix Enterprise Project Settings Icons

Font awesome was upgraded in CE and the corresponding enterprise project settings icons 'Groups' and 'Git Hooks' were not displaying any icon. The groups icon is exactly as it was pre-7.5. The git hooks icon is much different in the new font-awesome and did not make sense anymore. They do have a generic 'git' icon which I have included here and think looks nice.

## Pre-7.5:
![Screen Shot 2014-11-21 at 5.14.07 PM](https://gitlab.com/uploads/subscribers/gitlab-ee/12c3034fef/Screen_Shot_2014-11-21_at_5.14.07_PM.png)

## 7.5:
![Screen Shot 2014-11-21 at 5.14.24 PM](https://gitlab.com/uploads/subscribers/gitlab-ee/4f97728c19/Screen_Shot_2014-11-21_at_5.14.24_PM.png)

## After this merge request:
![Screen Shot 2014-11-21 at 5.14.17 PM](https://gitlab.com/uploads/subscribers/gitlab-ee/09b06bfddc/Screen_Shot_2014-11-21_at_5.14.17_PM.png)

See merge request !24
parents 991204ea c65e4f94
......@@ -9,7 +9,7 @@
Members
= nav_link(controller: :group_links) do
= link_to project_group_links_path(@project) do
%i.icon-share
%i.fa.fa-share-square-o
Groups
= nav_link(controller: :deploy_keys) do
= link_to project_deploy_keys_path(@project) do
......@@ -21,7 +21,7 @@
Web Hooks
= nav_link(controller: :git_hooks) do
= link_to project_git_hooks_path(@project) do
%i.icon-upload
%i.fa.fa-git-square
Git Hooks
= nav_link(controller: :services) do
= link_to project_services_path(@project) do
......
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