diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-09-05 22:29:54 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-09-05 22:29:54 +0000 |
| commit | 8769961679e320e7ee8016fbd8b9134863c40888 (patch) | |
| tree | 3afdcbed2a80a7d92033291c0b008f834c5798bb /app/assets | |
| parent | 597b05179d329a77df2389e4fd7e394484e74e51 (diff) | |
| download | gitlab-ce-8769961679e320e7ee8016fbd8b9134863c40888.tar.gz | |
Make search dropdowns consistent
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 14 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/search.scss | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index d65bbc0d808..6f7671aa6fe 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -637,11 +637,15 @@ GitLabDropdown = (function() { value = this.options.id ? this.options.id(data) : data.id; fieldName = this.options.fieldName; - if (value) { value = value.toString().replace(/'/g, '\\\''); } - - field = this.dropdown.parent().find("input[name='" + fieldName + "'][value='" + value + "']"); - if (field.length) { - selected = true; + if (value) { + value = value.toString().replace(/'/g, '\\\''); + field = this.dropdown.parent().find(`input[name='${fieldName}'][value='${value}']`); + if (field.length) { + selected = true; + } + } else { + field = this.dropdown.parent().find(`input[name='${fieldName}']`); + selected = !field.length; } } // Set URL diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index e65a78b8dc3..6b21def33a6 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -766,6 +766,7 @@ box-shadow: none; padding: 8px 16px; text-align: left; + white-space: normal; width: 100%; // make sure the text color is not overriden diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 8d73246223d..615020ca856 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -190,6 +190,8 @@ input[type="checkbox"]:hover { } .search-holder { + @include new-style-dropdown; + @media (min-width: $screen-sm-min) { display: -webkit-flex; display: flex; |