diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-29 12:41:00 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-29 12:41:00 +0200 |
| commit | 5c17fe58fba1cb7f8c5edb336b4de0feaa6254ea (patch) | |
| tree | 1aa2e7d71733a7bdd4393c1eaa8d8140eb09937d | |
| parent | e97e130e47daaa24507fd402584e2e0e0690bfe9 (diff) | |
| download | gitlab-ce-icons-update-nav-bars.tar.gz | |
FIxed the clearing icon + jumping of fluid nav baricons-update-nav-bars
| -rw-r--r-- | app/assets/javascripts/search_autocomplete.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/new-nav.scss | 2 |
2 files changed, 2 insertions, 1 deletions
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; |