diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-21 17:41:56 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-21 17:41:56 +0300 |
commit | de729a1e9c8ab6c743edd1d085dc02cafcc09e5b (patch) | |
tree | a3074eed1287735c77be28692477e9b09f27b5da /app | |
parent | f4a87d9f18006535a7570073836345a111e3977f (diff) | |
parent | 09e0f8abb4f9241b6cbb01624666313caaced184 (diff) |
Merge branch 'ci-nav-fw' into 'master'
Use fixed-width icons in CI nav sidebar.
See merge request !1376
Diffstat (limited to 'app')
-rw-r--r-- | app/views/layouts/ci/_nav_admin.html.haml | 10 | ||||
-rw-r--r-- | app/views/layouts/ci/_nav_project.html.haml | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/app/views/layouts/ci/_nav_admin.html.haml b/app/views/layouts/ci/_nav_admin.html.haml index e9974c85733..af2545a22d8 100644 --- a/app/views/layouts/ci/_nav_admin.html.haml +++ b/app/views/layouts/ci/_nav_admin.html.haml @@ -8,26 +8,26 @@ %li.separate-item = nav_link path: 'projects#index' do = link_to ci_admin_projects_path do - %i.fa.fa-list-alt + = icon('list-alt fw') Projects = nav_link path: 'events#index' do = link_to ci_admin_events_path do - %i.fa.fa-book + = icon('book fw') Events = nav_link path: ['runners#index', 'runners#show'] do = link_to ci_admin_runners_path do - %i.fa.fa-cog + = icon('cog fw') Runners %small.pull-right = Ci::Runner.count(:all) = nav_link path: 'builds#index' do = link_to ci_admin_builds_path do - %i.fa.fa-link + = icon('link fw') Builds %small.pull-right = Ci::Build.count(:all) = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do = link_to ci_admin_application_settings_path do - %i.fa.fa-cogs + = icon('cogs fw') %span Settings diff --git a/app/views/layouts/ci/_nav_project.html.haml b/app/views/layouts/ci/_nav_project.html.haml index 0f155c7dfef..b7e997be108 100644 --- a/app/views/layouts/ci/_nav_project.html.haml +++ b/app/views/layouts/ci/_nav_project.html.haml @@ -6,48 +6,48 @@ %li.separate-item = nav_link path: ['projects#show', 'commits#show', 'builds#show'] do = link_to ci_project_path(@project) do - %i.fa.fa-list-alt + = icon('list-alt fw') %span Commits %span.count= @project.commits.count = nav_link path: 'charts#show' do = link_to ci_project_charts_path(@project) do - %i.fa.fa-bar-chart + = icon('bar-chart fw') %span Charts = nav_link path: ['runners#index', 'runners#show', 'runners#edit'] do = link_to ci_project_runners_path(@project) do - %i.fa.fa-cog + = icon('cog fw') %span Runners = nav_link path: 'variables#show' do = link_to ci_project_variables_path(@project) do - %i.fa.fa-code + = icon('code fw') %span Variables = nav_link path: 'web_hooks#index' do = link_to ci_project_web_hooks_path(@project) do - %i.fa.fa-link + = icon('link fw') %span Web Hooks = nav_link path: 'triggers#index' do = link_to ci_project_triggers_path(@project) do - %i.fa.fa-retweet + = icon('retweet fw') %span Triggers = nav_link path: ['services#index', 'services#edit'] do = link_to ci_project_services_path(@project) do - %i.fa.fa-share + = icon('share fw') %span Services = nav_link path: 'events#index' do = link_to ci_project_events_path(@project) do - %i.fa.fa-book + = icon('book fw') %span Events %li.separate-item = nav_link path: 'projects#edit' do = link_to edit_ci_project_path(@project) do - %i.fa.fa-cogs + = icon('cogs fw') %span Settings |