summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-05-24 17:14:14 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-05-25 17:14:28 -0500
commit1965ec6324d7a67aec485b98030794657624d3ec (patch)
tree4de75bd47b6b2c6c0868bb226fa10b473c72022b /app/assets/stylesheets
parent1a1eaf481a19cbeedaf5b6137eef73031f33e3d2 (diff)
downloadgitlab-ce-1965ec6324d7a67aec485b98030794657624d3ec.tar.gz
Add fade to project nav; fix bug with controls
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/nav.scss22
1 files changed, 14 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 182dd05225f..59e9a036f71 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -274,14 +274,7 @@
.fade-right {
@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 {
@@ -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 {