diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-21 19:01:37 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-21 19:01:37 +0300 |
commit | 5ecae728e3ca6e64b29edd485640771adc683fa9 (patch) | |
tree | ec7beb19a5df75d85c193344a703b68880f8065e /app/views/layouts | |
parent | df689bdf69eec47475dcfd16cc7cf01bfc5686b2 (diff) | |
parent | 7c41f35953494f5f7372a434c8c62a7b466c8212 (diff) |
Merge branch 'li-fade'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4799
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/nav/_admin.html.haml | 4 | ||||
-rw-r--r-- | app/views/layouts/nav/_group.html.haml | 4 | ||||
-rw-r--r-- | app/views/layouts/nav/_profile.html.haml | 4 | ||||
-rw-r--r-- | app/views/layouts/nav/_project.html.haml | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml index 8b1acd8d52a..66e5ec1ad1a 100644 --- a/app/views/layouts/nav/_admin.html.haml +++ b/app/views/layouts/nav/_admin.html.haml @@ -2,7 +2,7 @@ = render 'layouts/nav/admin_settings' %ul.nav-links.scrolling-tabs - .fade-left + %li.fade-left = icon('arrow-left') = nav_link(controller: %w(dashboard admin projects users groups builds runners), html_options: {class: 'home'}) do = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do @@ -37,5 +37,5 @@ = link_to admin_spam_logs_path, title: "Spam Logs" do %span Spam Logs - .fade-right + %li.fade-right = icon('arrow-right') diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index 42052373cee..f7aa9fab7cf 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/app/views/layouts/nav/_group.html.haml @@ -2,7 +2,7 @@ = render 'layouts/nav/group_settings' %ul.nav-links.scrolling-tabs - .fade-left + %li.fade-left = icon('arrow-left') = nav_link(path: 'groups#show', html_options: {class: 'home'}) do = link_to group_path(@group), title: 'Home' do @@ -32,5 +32,5 @@ = link_to group_group_members_path(@group), title: 'Members' do %span Members - .fade-right + %li.fade-right = icon('arrow-right') diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml index 7fc68398870..44ea939b7e4 100644 --- a/app/views/layouts/nav/_profile.html.haml +++ b/app/views/layouts/nav/_profile.html.haml @@ -1,5 +1,5 @@ %ul.nav-links.scrolling-tabs - .fade-left + %li.fade-left = icon('arrow-left') = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = link_to profile_path, title: 'Profile Settings' do @@ -44,5 +44,5 @@ = link_to audit_log_profile_path, title: 'Audit Log' do %span Audit Log - .fade-right + %li.fade-right = icon('arrow-right') diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 840777920a5..1ace5d23ba3 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -25,7 +25,7 @@ %div{ class: nav_control_class } %ul.nav-links.scrolling-tabs - .fade-left + %li.fade-left = icon('arrow-left') = nav_link(path: 'projects#show', html_options: {class: 'home'}) do = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do @@ -110,5 +110,5 @@ %li.hidden = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do Commits - .fade-right + %li.fade-right = icon('arrow-right') |