diff --git a/CHANGELOG b/CHANGELOG index ed3028900d6e36707f070b1e8f4e363f55e92d4f..5abaff41e958fb9b0bdd12e162803865033c8e00 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -144,6 +144,7 @@ v 8.9.0 (unreleased) - ExtractsPath get ref_names from repository cache, if not there access git. - Cache user todo counts from TodoService - Ensure Todos counters doesn't count Todos for projects pending delete + - Add left/right arrows horizontal navigation v 8.8.5 - Import GitHub repositories respecting the API rate limit !4166 diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 5c68f90e3439be59340100e9bf684ee6a5160d5e..694f09c04644a7b3d8de75efaba048769b001f40 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -18,6 +18,13 @@ opacity: 0; transition-duration: .3s; } + + .fa { + position: relative; + top: 3px; + font-size: 13px; + color: $btn-placeholder-gray; + } } @mixin scrolling-links() { @@ -320,11 +327,19 @@ .fade-right { @include fade(left, rgba(250, 250, 250, 0.4), $background-color); right: 0; + + .fa { + right: -7px; + } } .fade-left { @include fade(right, rgba(250, 250, 250, 0.4), $background-color); left: 0; + + .fa { + left: -7px; + } } li { diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml index 4722c9d93537fb5ef736b5e306d68e39e22e3bcc..8b1acd8d52ab1a2f19dde23689775b65ff5d8128 100644 --- a/app/views/layouts/nav/_admin.html.haml +++ b/app/views/layouts/nav/_admin.html.haml @@ -3,6 +3,7 @@ %ul.nav-links.scrolling-tabs .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 %span @@ -37,3 +38,4 @@ %span Spam Logs .fade-right + = icon('arrow-right') diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index 66361a644dd1534d3f68548d4bc7928c3b4dc26b..42052373ceed161df553c59bea43409358a62fba 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/app/views/layouts/nav/_group.html.haml @@ -3,6 +3,7 @@ %ul.nav-links.scrolling-tabs .fade-left + = icon('arrow-left') = nav_link(path: 'groups#show', html_options: {class: 'home'}) do = link_to group_path(@group), title: 'Home' do %span @@ -32,3 +33,4 @@ %span Members .fade-right + = icon('arrow-right') diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml index bb6f14a62259706636b5740d574e8e8a4d04a063..7fc68398870d91ed53f0773ce3941d8354c0da08 100644 --- a/app/views/layouts/nav/_profile.html.haml +++ b/app/views/layouts/nav/_profile.html.haml @@ -1,5 +1,6 @@ %ul.nav-links.scrolling-tabs .fade-left + = icon('arrow-left') = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = link_to profile_path, title: 'Profile Settings' do %span @@ -44,3 +45,4 @@ %span Audit Log .fade-right + = icon('arrow-right') diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 39ea4920ccc5a9f99c11f80176a5bf5406c7e677..840777920a5bbdbc89966d346242da9d318950b7 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -26,6 +26,7 @@ %div{ class: nav_control_class } %ul.nav-links.scrolling-tabs .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 %span @@ -110,3 +111,4 @@ = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do Commits .fade-right + = icon('arrow-right') diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml index c8aa849c2178efa5cd4d3fd7ce04bfb792290658..7236b299efc6adc84acf532a4c3a902f8c9700fc 100644 --- a/app/views/projects/commits/_head.html.haml +++ b/app/views/projects/commits/_head.html.haml @@ -2,6 +2,7 @@ .nav-links.sub-nav.scrolling-tabs %ul{ class: (container_class) } .fade-left + = icon('arrow-left') = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do = link_to project_files_path(@project) do Files @@ -26,3 +27,4 @@ = link_to namespace_project_tags_path(@project.namespace, @project) do Tags .fade-right + = icon('arrow-right') diff --git a/app/views/shared/_event_filter.html.haml b/app/views/shared/_event_filter.html.haml index 300550022130653b035a090fd4faffd7df44340f..f96cc981c8d61feff2980619bd27775d7cc25a79 100644 --- a/app/views/shared/_event_filter.html.haml +++ b/app/views/shared/_event_filter.html.haml @@ -1,7 +1,9 @@ %ul.nav-links.event-filter.scrolling-tabs .fade-left + = icon('arrow-left') = event_filter_link EventFilter.push, 'Push events' = event_filter_link EventFilter.merged, 'Merge events' = event_filter_link EventFilter.comments, 'Comments' = event_filter_link EventFilter.team, 'Team' .fade-right + = icon('arrow-right')