diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-07-03 19:16:19 +0300 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-07-03 19:16:19 +0300 |
| commit | 345d9d1d2220466918b0ba8abbc7780483a28106 (patch) | |
| tree | d6be8f27275be0f64243c78604aa587c9efcda53 | |
| parent | acc6e3a0fdb8f710d77b8faa2a39823f7e1c7e5d (diff) | |
| parent | 31c89e5bbb51be72bfeff9b2058040fae6a8879d (diff) | |
Merge branch '48634-header-navbar-line-seperator-is-missing' into 'master'
Resolve "The header navbar line separator is missing"
Closes #48634
See merge request gitlab-org/gitlab-ce!20282
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 2 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/48634-header-navbar-line-separator-is-missing.yml | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 5789c3fa1b1..8bcaf5eb6ac 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -268,8 +268,6 @@ .navbar-sub-nav, .navbar-nav { - align-items: center; - > li { > a:hover, > a:focus { diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 5cec443e969..d8e32651b36 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -21,7 +21,7 @@ - if current_user = render 'layouts/header/new_dropdown' - if header_link?(:search) - %li.nav-item.d-none.d-sm-none.d-md-block + %li.nav-item.d-none.d-sm-none.d-md-block.m-auto = render 'layouts/search' unless current_controller?(:search) %li.nav-item.d-inline-block.d-sm-none.d-md-none = link_to search_path, title: 'Search', aria: { label: "Search" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do diff --git a/changelogs/unreleased/48634-header-navbar-line-separator-is-missing.yml b/changelogs/unreleased/48634-header-navbar-line-separator-is-missing.yml new file mode 100644 index 00000000000..92d9295982e --- /dev/null +++ b/changelogs/unreleased/48634-header-navbar-line-separator-is-missing.yml @@ -0,0 +1,5 @@ +--- +title: Line separator to the left of the 'Admin area' wrench icon had vanished +merge_request: 20282 +author: bitsapien +type: fixed |