From 5c17fe58fba1cb7f8c5edb336b4de0feaa6254ea Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Fri, 29 Sep 2017 12:41:00 +0200 Subject: FIxed the clearing icon + jumping of fluid nav bar --- app/assets/javascripts/search_autocomplete.js | 1 + app/assets/stylesheets/framework/new-nav.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js index 38c9a71dd20..f15452ec683 100644 --- a/app/assets/javascripts/search_autocomplete.js +++ b/app/assets/javascripts/search_autocomplete.js @@ -287,6 +287,7 @@ import { isInGroupsPage, isInProjectPage, getGroupSlug, getProjectSlug } from '. onClearInputClick(e) { e.preventDefault(); + this.wrap.toggleClass('has-value', !!e.target.value); return this.searchInput.val('').focus(); } diff --git a/app/assets/stylesheets/framework/new-nav.scss b/app/assets/stylesheets/framework/new-nav.scss index 5e4619638e2..3abf3e4ac7d 100644 --- a/app/assets/stylesheets/framework/new-nav.scss +++ b/app/assets/stylesheets/framework/new-nav.scss @@ -120,7 +120,7 @@ header.navbar-gitlab-new { .container-fluid { .navbar-toggle { min-width: 45px; - padding: 4px $gl-padding; + padding: 0 $gl-padding; margin-right: -7px; text-align: center; color: currentColor; -- cgit v1.2.1