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
This commit is contained in:
Annabel Gray 2018-07-03 16:16:19 +00:00
commit 345d9d1d22
3 changed files with 6 additions and 3 deletions

View File

@ -268,8 +268,6 @@
.navbar-sub-nav,
.navbar-nav {
align-items: center;
> li {
> a:hover,
> a:focus {

View File

@ -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

View File

@ -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