summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-31 15:43:28 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-31 15:43:28 +0000
commitfc7454d89793681ce6bc2f07686edfb302fe005c (patch)
tree8002a5848cbb5ba87fd2f76bdef4a7fcaa7ace99 /app
parent47cc1fea39be0e01e86c83720a6374b929ab9a34 (diff)
parent80b621bc385e789ace04671a9b90528c07373c5b (diff)
downloadgitlab-ce-fc7454d89793681ce6bc2f07686edfb302fe005c.tar.gz
Merge branch 'nav-weird-gap-fix' into 'master'
Fixed a gap underneath the scrolling inner page links See merge request !10325
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/nav.scss8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 0e09638a8cc..e6d808717f3 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -146,6 +146,10 @@
display: block;
}
+ &.scrolling-tabs {
+ float: left;
+ }
+
li a {
padding: 16px 15px 11px;
}
@@ -480,6 +484,10 @@
.inner-page-scroll-tabs {
position: relative;
+ .nav-links {
+ padding-bottom: 1px;
+ }
+
.fade-right {
@include fade(left, $white-light);
right: 0;