summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-22 21:26:41 -0500
committerJacob Schatz <jschatz1@gmail.com>2016-06-23 17:45:22 -0400
commit12aca07723c62b3ef79c774ae43ffa2c5b1f5ab1 (patch)
treef7bf3477f21d9d9b4f403df17f095106284bf366 /app
parentee8b0d37fa086e2a467c383b01e7138587151570 (diff)
downloadgitlab-ce-12aca07723c62b3ef79c774ae43ffa2c5b1f5ab1.tar.gz
Fix positioning of Repository sub nav scrolling
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/nav.scss19
-rw-r--r--app/views/projects/commits/_head.html.haml2
2 files changed, 20 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 5578cd6b8e1..6211bc04597 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -368,6 +368,25 @@
left: -7px;
}
}
+
+ &.sub-nav-scroll {
+
+ .fade-right {
+ right: 0;
+
+ .fa {
+ right: -23px;
+ }
+ }
+
+ .fade-left {
+ left: 0;
+
+ .fa {
+ left: 10px;
+ }
+ }
+ }
}
.nav-block {
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index db0d3754082..b11b6c24ccd 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -1,4 +1,4 @@
-.scrolling-tabs-container
+.scrolling-tabs-container.sub-nav-scroll
.fade-left
= icon('arrow-left')
.fade-right