diff options
| author | Phil Hughes <me@iamphill.com> | 2017-03-02 10:43:48 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-03-02 10:43:48 +0000 |
| commit | 86fe7d6aeceae5f0472adea1c2829aa45757c786 (patch) | |
| tree | 2e08c26d7c7ac012389da87ee8f24ae3a94ce5c8 | |
| parent | d4154195329b0a823848df8ceae144aebd6ccf6b (diff) | |
| download | gitlab-ce-86fe7d6aeceae5f0472adea1c2829aa45757c786.tar.gz | |
Fixed spacing in mobile secondary nav
Previously the spacing was spread evenly across the width which lead to
some weird spacing issues, more noticeable between the user avatar & the
dropdown caret
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 11 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 685a4847731..99651559d0d 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -261,20 +261,15 @@ header { .navbar-nav { margin: 0; - float: none !important; - - .visible-xs, - .visible-sm { - display: table-cell !important; - } + padding-right: 10px; + text-align: right; } .navbar-collapse { padding-left: 5px; .nav > li { - display: table-cell; - width: 1%; + display: inline-block; } } } 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 |