Commit de729a1e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ci-nav-fw' into 'master'

Use fixed-width icons in CI nav sidebar.



See merge request !1376
parents f4a87d9f 09e0f8ab
...@@ -8,26 +8,26 @@ ...@@ -8,26 +8,26 @@
%li.separate-item %li.separate-item
= nav_link path: 'projects#index' do = nav_link path: 'projects#index' do
= link_to ci_admin_projects_path do = link_to ci_admin_projects_path do
%i.fa.fa-list-alt = icon('list-alt fw')
Projects Projects
= nav_link path: 'events#index' do = nav_link path: 'events#index' do
= link_to ci_admin_events_path do = link_to ci_admin_events_path do
%i.fa.fa-book = icon('book fw')
Events Events
= nav_link path: ['runners#index', 'runners#show'] do = nav_link path: ['runners#index', 'runners#show'] do
= link_to ci_admin_runners_path do = link_to ci_admin_runners_path do
%i.fa.fa-cog = icon('cog fw')
Runners Runners
%small.pull-right %small.pull-right
= Ci::Runner.count(:all) = Ci::Runner.count(:all)
= nav_link path: 'builds#index' do = nav_link path: 'builds#index' do
= link_to ci_admin_builds_path do = link_to ci_admin_builds_path do
%i.fa.fa-link = icon('link fw')
Builds Builds
%small.pull-right %small.pull-right
= Ci::Build.count(:all) = Ci::Build.count(:all)
= nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
= link_to ci_admin_application_settings_path do = link_to ci_admin_application_settings_path do
%i.fa.fa-cogs = icon('cogs fw')
%span %span
Settings Settings
...@@ -6,48 +6,48 @@ ...@@ -6,48 +6,48 @@
%li.separate-item %li.separate-item
= nav_link path: ['projects#show', 'commits#show', 'builds#show'] do = nav_link path: ['projects#show', 'commits#show', 'builds#show'] do
= link_to ci_project_path(@project) do = link_to ci_project_path(@project) do
%i.fa.fa-list-alt = icon('list-alt fw')
%span %span
Commits Commits
%span.count= @project.commits.count %span.count= @project.commits.count
= nav_link path: 'charts#show' do = nav_link path: 'charts#show' do
= link_to ci_project_charts_path(@project) do = link_to ci_project_charts_path(@project) do
%i.fa.fa-bar-chart = icon('bar-chart fw')
%span %span
Charts Charts
= nav_link path: ['runners#index', 'runners#show', 'runners#edit'] do = nav_link path: ['runners#index', 'runners#show', 'runners#edit'] do
= link_to ci_project_runners_path(@project) do = link_to ci_project_runners_path(@project) do
%i.fa.fa-cog = icon('cog fw')
%span %span
Runners Runners
= nav_link path: 'variables#show' do = nav_link path: 'variables#show' do
= link_to ci_project_variables_path(@project) do = link_to ci_project_variables_path(@project) do
%i.fa.fa-code = icon('code fw')
%span %span
Variables Variables
= nav_link path: 'web_hooks#index' do = nav_link path: 'web_hooks#index' do
= link_to ci_project_web_hooks_path(@project) do = link_to ci_project_web_hooks_path(@project) do
%i.fa.fa-link = icon('link fw')
%span %span
Web Hooks Web Hooks
= nav_link path: 'triggers#index' do = nav_link path: 'triggers#index' do
= link_to ci_project_triggers_path(@project) do = link_to ci_project_triggers_path(@project) do
%i.fa.fa-retweet = icon('retweet fw')
%span %span
Triggers Triggers
= nav_link path: ['services#index', 'services#edit'] do = nav_link path: ['services#index', 'services#edit'] do
= link_to ci_project_services_path(@project) do = link_to ci_project_services_path(@project) do
%i.fa.fa-share = icon('share fw')
%span %span
Services Services
= nav_link path: 'events#index' do = nav_link path: 'events#index' do
= link_to ci_project_events_path(@project) do = link_to ci_project_events_path(@project) do
%i.fa.fa-book = icon('book fw')
%span %span
Events Events
%li.separate-item %li.separate-item
= nav_link path: 'projects#edit' do = nav_link path: 'projects#edit' do
= link_to edit_ci_project_path(@project) do = link_to edit_ci_project_path(@project) do
%i.fa.fa-cogs = icon('cogs fw')
%span %span
Settings Settings
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