Commit 1965ec63 authored by Annabel Dunstone's avatar Annabel Dunstone

Add fade to project nav; fix bug with controls

parent 1a1eaf48
...@@ -274,15 +274,8 @@ ...@@ -274,15 +274,8 @@
.fade-right { .fade-right {
@include fade(left); @include fade(left);
right: 58px;
@media (min-width: $screen-xs-max) {
right: 67px;
}
@media (max-width: $screen-xs-min) {
right: 0; right: 0;
} }
}
.fade-left { .fade-left {
@include fade(right); @include fade(right);
...@@ -310,6 +303,19 @@ ...@@ -310,6 +303,19 @@
} }
} }
} }
.nav-control {
.fade-right {
right: 58px;
@media (min-width: $screen-xs-max) {
right: 67px;
}
@media (max-width: $screen-xs-min) {
right: 0;
}
}
}
} }
.page-with-layout-nav { .page-with-layout-nav {
......
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
data: { confirm: leave_project_message(@project) }, method: :delete, title: 'Leave project' do data: { confirm: leave_project_message(@project) }, method: :delete, title: 'Leave project' do
Leave Project Leave Project
%ul.nav-links %div{ class: nav_control_class }
%ul.nav-links#scrolling-tabs
.fade-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
= icon('bookmark fw') = icon('bookmark fw')
...@@ -129,3 +131,5 @@ ...@@ -129,3 +131,5 @@
%li.hidden %li.hidden
= link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'shortcuts-new-issue' do = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'shortcuts-new-issue' do
Create a new issue Create a new issue
.fade-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