Commit ddea2e3f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets Committed by Robert Speicher

Merge branch '18881-horizontal-nav-arrow'

parent 2a1085a9
...@@ -149,6 +149,7 @@ v 8.8.5 (unreleased) ...@@ -149,6 +149,7 @@ v 8.8.5 (unreleased)
- Cache user todo counts from TodoService - Cache user todo counts from TodoService
- Ensure Todos counters doesn't count Todos for projects pending delete - Ensure Todos counters doesn't count Todos for projects pending delete
- Add tooltip to pin/unpin navbar - Add tooltip to pin/unpin navbar
- Add left/right arrows horizontal navigation
v 8.8.5 v 8.8.5
- Import GitHub repositories respecting the API rate limit !4166 - Import GitHub repositories respecting the API rate limit !4166
......
...@@ -18,6 +18,13 @@ ...@@ -18,6 +18,13 @@
opacity: 0; opacity: 0;
transition-duration: .3s; transition-duration: .3s;
} }
.fa {
position: relative;
top: 3px;
font-size: 13px;
color: $btn-placeholder-gray;
}
} }
@mixin scrolling-links() { @mixin scrolling-links() {
...@@ -320,11 +327,19 @@ ...@@ -320,11 +327,19 @@
.fade-right { .fade-right {
@include fade(left, rgba(250, 250, 250, 0.4), $background-color); @include fade(left, rgba(250, 250, 250, 0.4), $background-color);
right: 0; right: 0;
.fa {
right: -7px;
}
} }
.fade-left { .fade-left {
@include fade(right, rgba(250, 250, 250, 0.4), $background-color); @include fade(right, rgba(250, 250, 250, 0.4), $background-color);
left: 0; left: 0;
.fa {
left: -7px;
}
} }
li { li {
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
%ul.nav-links.scrolling-tabs %ul.nav-links.scrolling-tabs
.fade-left .fade-left
= icon('arrow-left')
= nav_link(controller: %w(dashboard admin projects users groups builds runners), html_options: {class: 'home'}) do = 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 = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
%span %span
...@@ -37,3 +38,4 @@ ...@@ -37,3 +38,4 @@
%span %span
Spam Logs Spam Logs
.fade-right .fade-right
= icon('arrow-right')
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
%ul.nav-links.scrolling-tabs %ul.nav-links.scrolling-tabs
.fade-left .fade-left
= icon('arrow-left')
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
= link_to group_path(@group), title: 'Home' do = link_to group_path(@group), title: 'Home' do
%span %span
...@@ -32,3 +33,4 @@ ...@@ -32,3 +33,4 @@
%span %span
Members Members
.fade-right .fade-right
= icon('arrow-right')
%ul.nav-links.scrolling-tabs %ul.nav-links.scrolling-tabs
.fade-left .fade-left
= icon('arrow-left')
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
= link_to profile_path, title: 'Profile Settings' do = link_to profile_path, title: 'Profile Settings' do
%span %span
...@@ -44,3 +45,4 @@ ...@@ -44,3 +45,4 @@
%span %span
Audit Log Audit Log
.fade-right .fade-right
= icon('arrow-right')
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
%div{ class: nav_control_class } %div{ class: nav_control_class }
%ul.nav-links.scrolling-tabs %ul.nav-links.scrolling-tabs
.fade-left .fade-left
= icon('arrow-left')
= nav_link(path: 'projects#show', html_options: {class: 'home'}) do = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
= link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
%span %span
...@@ -110,3 +111,4 @@ ...@@ -110,3 +111,4 @@
= link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
Commits Commits
.fade-right .fade-right
= icon('arrow-right')
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
.nav-links.sub-nav.scrolling-tabs .nav-links.sub-nav.scrolling-tabs
%ul{ class: (container_class) } %ul{ class: (container_class) }
.fade-left .fade-left
= icon('arrow-left')
= nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
= link_to project_files_path(@project) do = link_to project_files_path(@project) do
Files Files
...@@ -26,3 +27,4 @@ ...@@ -26,3 +27,4 @@
= link_to namespace_project_tags_path(@project.namespace, @project) do = link_to namespace_project_tags_path(@project.namespace, @project) do
Tags Tags
.fade-right .fade-right
= icon('arrow-right')
%ul.nav-links.event-filter.scrolling-tabs %ul.nav-links.event-filter.scrolling-tabs
.fade-left .fade-left
= icon('arrow-left')
= event_filter_link EventFilter.push, 'Push events' = event_filter_link EventFilter.push, 'Push events'
= event_filter_link EventFilter.merged, 'Merge events' = event_filter_link EventFilter.merged, 'Merge events'
= event_filter_link EventFilter.comments, 'Comments' = event_filter_link EventFilter.comments, 'Comments'
= event_filter_link EventFilter.team, 'Team' = event_filter_link EventFilter.team, 'Team'
.fade-right .fade-right
= icon('arrow-right')
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