Commit 61e33265 authored by Clement Ho's avatar Clement Ho

Merge branch 'winh-search-dropdowns-ee' into 'master'

Make search dropdowns consistent

See merge request !2804
parents e5e3f88e bafcae5c
...@@ -654,9 +654,14 @@ GitLabDropdown = (function() { ...@@ -654,9 +654,14 @@ GitLabDropdown = (function() {
if (!selected) { if (!selected) {
fieldName = this.options.fieldName; fieldName = this.options.fieldName;
field = this.dropdown.parent().find("input[name='" + fieldName + "'][value='" + value + "']"); if (value) {
if (field.length) { field = this.dropdown.parent().find(`input[name='${fieldName}'][value='${value}']`);
selected = true; if (field.length) {
selected = true;
}
} else {
field = this.dropdown.parent().find(`input[name='${fieldName}']`);
selected = !field.length;
} }
} }
// Set URL // Set URL
......
...@@ -757,6 +757,7 @@ ...@@ -757,6 +757,7 @@
button { button {
border-radius: 0; border-radius: 0;
padding: 8px 16px; padding: 8px 16px;
white-space: normal;
// make sure the text color is not overriden // make sure the text color is not overriden
&.text-danger { &.text-danger {
......
...@@ -190,6 +190,8 @@ input[type="checkbox"]:hover { ...@@ -190,6 +190,8 @@ input[type="checkbox"]:hover {
} }
.search-holder { .search-holder {
@include new-style-dropdown;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment