summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-28 16:17:04 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-10-06 12:12:11 -0700
commitaf86b5dec1ac8ea7120cc5eb51320bf21eea761a (patch)
tree2573d51584fcd2a2b74435dd80a36aef92e532ce /app
parent2ae20000a3c1a51a05c6048393ce2031a15ab6a8 (diff)
downloadgitlab-ce-af86b5dec1ac8ea7120cc5eb51320bf21eea761a.tar.gz
Fix scrolling tabs
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/blocks.scss6
-rw-r--r--app/assets/stylesheets/framework/secondary-navigation-elements.scss2
2 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index d63145771c9..dbd990f84c1 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -210,6 +210,12 @@
.nav-links {
justify-content: center;
+ width: 100%;
+ float: none;
+
+ &.scrolling-tabs {
+ float: none;
+ }
}
}
diff --git a/app/assets/stylesheets/framework/secondary-navigation-elements.scss b/app/assets/stylesheets/framework/secondary-navigation-elements.scss
index 1b9a26512b4..5be6bae3368 100644
--- a/app/assets/stylesheets/framework/secondary-navigation-elements.scss
+++ b/app/assets/stylesheets/framework/secondary-navigation-elements.scss
@@ -11,6 +11,8 @@
display: flex;
a {
+ padding: $gl-btn-padding;
+ padding-bottom: 11px;
font-size: 14px;
line-height: 28px;
color: $gl-text-color-secondary;