summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/header.scss
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-06 14:53:33 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-06 14:53:33 +0000
commit786adab14c39a90dc6cc5a3e4a63e0ab0e42ae86 (patch)
tree7983ea0641da2440c45993c871f4997e1e5b275e /app/assets/stylesheets/framework/header.scss
parent27729aa3a4666c6b06006c76023f4bff60f8ba25 (diff)
parent69b6a5a9e25c0035e492805305d5e4895146b693 (diff)
downloadgitlab-ce-786adab14c39a90dc6cc5a3e4a63e0ab0e42ae86.tar.gz
Merge branch 'second-nav-spacing-mobile' into 'master'
Fixed spacing in mobile secondary nav See merge request !9657
Diffstat (limited to 'app/assets/stylesheets/framework/header.scss')
-rw-r--r--app/assets/stylesheets/framework/header.scss28
1 files changed, 19 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index f4316ec7022..5d1aba4e529 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -260,24 +260,34 @@ header {
font-size: 18px;
.navbar-nav {
+ display: table;
+ table-layout: fixed;
+ width: 100%;
margin: 0;
- float: none !important;
-
- .visible-xs,
- .visible-sm {
- display: table-cell !important;
- }
+ text-align: right;
}
.navbar-collapse {
padding-left: 5px;
- .nav > li {
- display: table-cell;
- width: 1%;
+ .nav > li:not(.hidden-xs) {
+ display: table-cell!important;
+ width: 25%;
+
+ a {
+ margin-right: 8px;
+ }
}
}
}
+
+ .header-user-dropdown-toggle {
+ text-align: center;
+ }
+
+ .header-user-avatar {
+ float: none;
+ }
}
.header-user {