diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-06 14:53:33 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-06 14:53:33 +0000 |
| commit | 786adab14c39a90dc6cc5a3e4a63e0ab0e42ae86 (patch) | |
| tree | 7983ea0641da2440c45993c871f4997e1e5b275e /app | |
| parent | 27729aa3a4666c6b06006c76023f4bff60f8ba25 (diff) | |
| parent | 69b6a5a9e25c0035e492805305d5e4895146b693 (diff) | |
| download | gitlab-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')
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 28 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 |
2 files changed, 20 insertions, 10 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 { diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 555ec8ad079..6f4f2dbea3a 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -19,7 +19,7 @@ %ul.nav.navbar-nav %li.hidden-sm.hidden-xs = render 'layouts/search' unless current_controller?(:search) - %li.visible-sm.visible-xs + %li.visible-sm-inline-block.visible-xs-inline-block = link_to search_path, title: 'Search', aria: { label: "Search" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = icon('search') - if current_user |