summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-06-10 21:16:19 +0000
committerDouwe Maan <douwe@gitlab.com>2015-06-10 21:16:19 +0000
commit3de35168fd556a9ba980c9ffdb6705990a53a37a (patch)
treef2dcfb50dc506a1106d3a26d75cf8f4372f975f3
parent190c9e9f39c6d14c2a47083fcd5d64717919d9eb (diff)
parente34c1169a58dcb86cbba3c06ac1831c93a3f6978 (diff)
downloadgitlab-ce-3de35168fd556a9ba980c9ffdb6705990a53a37a.tar.gz
Merge branch 'project_settings_icons_alignment' into 'master'
Fix alignment of Project Settings nav icons. @douwe thanks for reviewing this small fix. ![before_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/ce213aa5b08c640ec5e9b018e0ec4036/before_after.png) See merge request !1848
-rw-r--r--app/views/layouts/nav/_project_settings.html.haml10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index 1794712e1c3..633c6ae6bfb 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -10,27 +10,27 @@
%ul.project-settings-nav.sidebar-subnav
= nav_link(path: 'projects#edit') do
= link_to edit_project_path(@project), title: 'Project', class: 'stat-tab tab', data: {placement: 'right'} do
- = icon('pencil-square-o')
+ = icon('pencil-square-o fw')
%span
Project Settings
= nav_link(controller: :deploy_keys) do
= link_to namespace_project_deploy_keys_path(@project.namespace, @project), title: 'Deploy Keys', data: {placement: 'right'} do
- = icon('key')
+ = icon('key fw')
%span
Deploy Keys
= nav_link(controller: :hooks) do
= link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Web Hooks', data: {placement: 'right'} do
- = icon('link')
+ = icon('link fw')
%span
Web Hooks
= nav_link(controller: :services) do
= link_to namespace_project_services_path(@project.namespace, @project), title: 'Services', data: {placement: 'right'} do
- = icon('cogs')
+ = icon('cogs fw')
%span
Services
= nav_link(controller: :protected_branches) do
= link_to namespace_project_protected_branches_path(@project.namespace, @project), title: 'Protected Branches', data: {placement: 'right'} do
- = icon('lock')
+ = icon('lock fw')
%span
Protected branches