diff options
-rw-r--r-- | app/assets/stylesheets/generic/sidebar.scss | 2 | ||||
-rw-r--r-- | app/views/layouts/nav/_admin.html.haml | 25 | ||||
-rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 14 | ||||
-rw-r--r-- | app/views/layouts/nav/_explore.html.haml | 8 | ||||
-rw-r--r-- | app/views/layouts/nav/_group.html.haml | 14 | ||||
-rw-r--r-- | app/views/layouts/nav/_profile.html.haml | 18 | ||||
-rw-r--r-- | app/views/layouts/nav/_project.html.haml | 26 | ||||
-rw-r--r-- | app/views/layouts/nav/_snippets.html.haml | 4 |
8 files changed, 55 insertions, 56 deletions
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss index 233c5a6ee04..754c5b53020 100644 --- a/app/assets/stylesheets/generic/sidebar.scss +++ b/app/assets/stylesheets/generic/sidebar.scss @@ -52,7 +52,7 @@ padding: 8px 15px; font-size: 13px; line-height: 20px; - padding-left: 20px; + padding-left: 16px; &:hover { text-decoration: none; diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml index 34efceb37d1..372fe9a6d36 100644 --- a/app/views/layouts/nav/_admin.html.haml +++ b/app/views/layouts/nav/_admin.html.haml @@ -1,65 +1,64 @@ %ul.nav.nav-sidebar = nav_link(controller: :dashboard, html_options: {class: 'home'}) do = link_to admin_root_path, title: "Stats" do - %i.fa.fa-dashboard + = icon('dashboard fw') %span Overview = nav_link(controller: :projects) do = link_to admin_namespaces_projects_path, title: 'Projects' do - %i.fa.fa-cube + = icon('cube fw') %span Projects = nav_link(controller: :users) do = link_to admin_users_path, title: 'Users' do - %i.fa.fa-user + = icon('user fw') %span Users = nav_link(controller: :groups) do = link_to admin_groups_path, title: 'Groups' do - %i.fa.fa-group + = icon('group fw') %span Groups = nav_link(controller: :deploy_keys) do = link_to admin_deploy_keys_path, title: 'Deploy Keys' do - %i.fa.fa-key + = icon('key fw') %span Deploy Keys = nav_link(controller: :logs) do = link_to admin_logs_path, title: 'Logs' do - %i.fa.fa-file-text + = icon('file-text fw') %span Logs = nav_link(controller: :broadcast_messages) do = link_to admin_broadcast_messages_path, title: 'Broadcast Messages' do - %i.fa.fa-bullhorn + = icon('bullhorn fw') %span Messages = nav_link(controller: :hooks) do = link_to admin_hooks_path, title: 'Hooks' do - %i.fa.fa-external-link + = icon('external-link fw') %span Hooks = nav_link(controller: :background_jobs) do = link_to admin_background_jobs_path, title: 'Background Jobs' do - %i.fa.fa-cog + = icon('cog fw') %span Background Jobs = nav_link(controller: :applications) do = link_to admin_applications_path, title: 'Applications' do - %i.fa.fa-cloud + = icon('cloud fw') %span Applications = nav_link(controller: :services) do = link_to admin_application_settings_services_path, title: 'Service Templates' do - %i.fa.fa-copy + = icon('copy fw') %span Service Templates = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do = link_to admin_application_settings_path, title: 'Settings' do - %i.fa.fa-cogs + = icon('cogs fw') %span Settings - diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index e4f630c6a18..c5997e44370 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -1,38 +1,38 @@ %ul.nav.nav-sidebar = nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do = link_to root_path, title: 'Home', class: 'shortcuts-activity' do - %i.fa.fa-dashboard + = icon('dashboard fw') %span Your Projects = nav_link(path: 'projects#starred') do = link_to starred_dashboard_projects_path, title: 'Starred Projects' do - %i.fa.fa-star + = icon('star fw') %span Starred Projects = nav_link(controller: :groups) do = link_to dashboard_groups_path, title: 'Groups' do - %i.fa.fa-group + = icon('group fw') %span Groups = nav_link(controller: :milestones) do = link_to dashboard_milestones_path, title: 'Milestones' do - %i.fa.fa-clock-o + = icon('clock-o fw') %span Milestones = nav_link(path: 'dashboard#issues') do = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'shortcuts-issues' do - %i.fa.fa-exclamation-circle + = icon('exclamation-circle fw') %span Issues %span.count= current_user.assigned_issues.opened.count = nav_link(path: 'dashboard#merge_requests') do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'shortcuts-merge_requests' do - %i.fa.fa-tasks + = icon('tasks fw') %span Merge Requests %span.count= current_user.assigned_merge_requests.opened.count = nav_link(controller: :help) do = link_to help_path, title: 'Help' do - %i.fa.fa-question-circle + = icon('question-circle fw') %span Help diff --git a/app/views/layouts/nav/_explore.html.haml b/app/views/layouts/nav/_explore.html.haml index 7ab370dbcd0..38d84cd9b51 100644 --- a/app/views/layouts/nav/_explore.html.haml +++ b/app/views/layouts/nav/_explore.html.haml @@ -1,18 +1,18 @@ %ul.nav.nav-sidebar = nav_link(path: 'projects#trending') do = link_to explore_root_path do - %i.fa.fa-comments + = icon('comments fw') %span Trending Projects = nav_link(path: 'projects#starred') do = link_to starred_explore_projects_path do - %i.fa.fa-star + = icon('star fw') %span Most Starred Projects = nav_link(path: 'projects#index') do = link_to explore_projects_path do - %i.fa.fa-bookmark + = icon('bookmark fw') %span All Projects = nav_link(controller: :groups) do = link_to explore_groups_path do - %i.fa.fa-group + = icon('group fw') %span All Groups diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index f0d92b7a12c..7cce9ffe3d5 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/app/views/layouts/nav/_group.html.haml @@ -1,42 +1,42 @@ %ul.nav.nav-sidebar = nav_link(path: 'groups#show', html_options: {class: 'home'}) do = link_to group_path(@group), title: "Home" do - %i.fa.fa-dashboard + = icon('dashboard fw') %span Activity - if current_user = nav_link(controller: [:group, :milestones]) do = link_to group_milestones_path(@group), title: 'Milestones' do - %i.fa.fa-clock-o + = icon('clock-o fw') %span Milestones = nav_link(path: 'groups#issues') do = link_to issues_group_path(@group), title: 'Issues' do - %i.fa.fa-exclamation-circle + = icon('exclamation-circle fw') %span Issues - if current_user %span.count= Issue.opened.of_group(@group).count = nav_link(path: 'groups#merge_requests') do = link_to merge_requests_group_path(@group), title: 'Merge Requests' do - %i.fa.fa-tasks + = icon('tasks fw') %span Merge Requests - if current_user %span.count= MergeRequest.opened.of_group(@group).count = nav_link(controller: [:group_members]) do = link_to group_group_members_path(@group), title: 'Members' do - %i.fa.fa-users + = icon('users fw') %span Members - if can?(current_user, :admin_group, @group) = nav_link(html_options: { class: "#{"active" if group_settings_page?} separate-item" }) do = link_to edit_group_path(@group), title: 'Settings', class: "tab no-highlight" do - %i.fa.fa-cogs + = icon ('cogs fw') %span Settings - %i.fa.fa-angle-down + = icon ('angle-down fw') - if group_settings_page? = render 'groups/settings_nav' diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml index d88e862829d..9f2932c79cd 100644 --- a/app/views/layouts/nav/_profile.html.haml +++ b/app/views/layouts/nav/_profile.html.haml @@ -1,50 +1,50 @@ %ul.nav.nav-sidebar = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = link_to profile_path, title: "Profile" do - %i.fa.fa-user + = icon('user fw') %span Profile = nav_link(controller: :accounts) do = link_to profile_account_path, title: 'Account' do - %i.fa.fa-gear + = icon('gear fw') %span Account = nav_link(path: ['profiles#applications', 'applications#edit', 'applications#show', 'applications#new']) do = link_to applications_profile_path, title: 'Applications' do - %i.fa.fa-cloud + = icon('cloud fw') %span Applications = nav_link(controller: :emails) do = link_to profile_emails_path, title: 'Emails' do - %i.fa.fa-envelope-o + = icon('envelope-o fw') %span Emails %span.count= current_user.emails.count + 1 - unless current_user.ldap_user? = nav_link(controller: :passwords) do = link_to edit_profile_password_path, title: 'Password' do - %i.fa.fa-lock + = icon('lock fw') %span Password = nav_link(controller: :notifications) do = link_to profile_notifications_path, title: 'Notifications' do - %i.fa.fa-inbox + = icon('inbox fw') %span Notifications = nav_link(controller: :keys) do = link_to profile_keys_path, title: 'SSH Keys' do - %i.fa.fa-key + = icon('key fw') %span SSH Keys %span.count= current_user.keys.count = nav_link(path: 'profiles#design') do = link_to design_profile_path, title: 'Design' do - %i.fa.fa-image + = icon('image fw') %span Design = nav_link(path: 'profiles#history') do = link_to history_profile_path, title: 'History' do - %i.fa.fa-history + = icon('history fw') %span History diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 6c13f30f627..a2a9d8a340b 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -2,7 +2,7 @@ - if @project_settings_nav = nav_link do = link_to project_path(@project), title: 'Back to project', class: "" do - %i.fa.fa-caret-square-o-left + = icon('caret-square-o-left fw') %span Back to project @@ -13,48 +13,48 @@ - else = nav_link(path: 'projects#show', html_options: {class: "home"}) do = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do - %i.fa.fa-dashboard + = icon('dashboard fw') %span Project - if project_nav_tab? :files = nav_link(controller: %w(tree blob blame edit_tree new_tree)) do = link_to namespace_project_tree_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Files', class: 'shortcuts-tree' do - %i.fa.fa-files-o + = icon('files-o fw') %span Files - if project_nav_tab? :commits = nav_link(controller: %w(commit commits compare repositories tags branches)) do = link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Commits', class: 'shortcuts-commits' do - %i.fa.fa-history + = icon('history fw') %span Commits - if project_nav_tab? :network = nav_link(controller: %w(network)) do = link_to namespace_project_network_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Network', class: 'shortcuts-network' do - %i.fa.fa-code-fork + = icon('code-fork fw') %span Network - if project_nav_tab? :graphs = nav_link(controller: %w(graphs)) do = link_to namespace_project_graph_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Graphs', class: 'shortcuts-graphs' do - %i.fa.fa-area-chart + = icon('area-chart fw') %span Graphs - if project_nav_tab? :milestones = nav_link(controller: :milestones) do = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do - %i.fa.fa-clock-o + = icon('clock-o fw') %span Milestones - if project_nav_tab? :issues = nav_link(controller: :issues) do = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do - %i.fa.fa-exclamation-circle + = icon('exclamation-circle fw') %span Issues - if @project.default_issues_tracker? @@ -63,7 +63,7 @@ - if project_nav_tab? :merge_requests = nav_link(controller: :merge_requests) do = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do - %i.fa.fa-tasks + = icon('tasks fw') %span Merge Requests %span.count.merge_counter= @project.merge_requests.opened.count @@ -71,27 +71,27 @@ - if project_nav_tab? :labels = nav_link(controller: :labels) do = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do - %i.fa.fa-tags + = icon('tags fw') %span Labels - if project_nav_tab? :wiki = nav_link(controller: :wikis) do = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do - %i.fa.fa-book + = icon('book fw') %span Wiki - if project_nav_tab? :snippets = nav_link(controller: :snippets) do = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do - %i.fa.fa-file-text-o + = icon('file-text-o fw') %span Snippets - if project_nav_tab? :settings = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do = link_to edit_project_path(@project), title: 'Settings', class: "stat-tab tab no-highlight" do - %i.fa.fa-cogs + = icon('cogs fw') %span Settings diff --git a/app/views/layouts/nav/_snippets.html.haml b/app/views/layouts/nav/_snippets.html.haml index e71967bc725..edd05f2dd81 100644 --- a/app/views/layouts/nav/_snippets.html.haml +++ b/app/views/layouts/nav/_snippets.html.haml @@ -1,11 +1,11 @@ %ul.nav.nav-sidebar = nav_link(path: user_snippets_path(current_user), html_options: {class: 'home'}) do = link_to user_snippets_path(current_user), title: 'Your snippets' do - %i.fa.fa-dashboard + = icon('dashboard fw') %span Your Snippets = nav_link(path: snippets_path) do = link_to snippets_path, title: 'Discover snippets' do - %i.fa.fa-globe + = icon('globe fw') %span Discover Snippets |