diff options
author | Robert Speicher <robert@gitlab.com> | 2015-08-21 16:20:18 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-08-21 16:20:18 +0000 |
commit | ab3ecb348e65a9579a8f5ffbdd70fd55c59b9f17 (patch) | |
tree | 17226f360f1754fa5e1cc241ac41acc762a5edf6 | |
parent | 8c1dd9a12aab49d9083484d313a4bd5656589ac0 (diff) | |
parent | 7b86ce22491572cf9e608a333fe544c35d445cdd (diff) | |
download | gitlab-ci-ab3ecb348e65a9579a8f5ffbdd70fd55c59b9f17.tar.gz |
Merge branch 'nav-icons' into 'master'
Fix navigation icons
See merge request !239
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/views/layouts/_nav_admin.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/_nav_project.html.haml | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -12,6 +12,7 @@ v7.14.0 (unreleased) - Added support for CI skipped status - Fix broken yaml error saving - Rename type(s) to stage(s) + - Fix navigation icons - Add missing stage when doing retry - Require variable keys to be not-empty and unique - Fix variable saving issue diff --git a/app/views/layouts/_nav_admin.html.haml b/app/views/layouts/_nav_admin.html.haml index 94b5468..412659a 100644 --- a/app/views/layouts/_nav_admin.html.haml +++ b/app/views/layouts/_nav_admin.html.haml @@ -5,7 +5,7 @@ Projects = nav_link path: 'events' do = link_to admin_events_path do - %i.icon-bar-chart + %i.icon-book Events = nav_link path: 'runners#index' do = link_to admin_runners_path do diff --git a/app/views/layouts/_nav_project.html.haml b/app/views/layouts/_nav_project.html.haml index 103b1c8..3a3ac08 100644 --- a/app/views/layouts/_nav_project.html.haml +++ b/app/views/layouts/_nav_project.html.haml @@ -22,7 +22,7 @@ Web Hooks = nav_link path: 'services#index' do = link_to project_services_path(@project) do - %i.icon-gear + %i.icon-share Services = nav_link path: 'events#index' do = link_to project_events_path(@project) do |