diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-02 16:40:57 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-02 16:40:57 +0000 |
| commit | 51c196160adfbdb723fa6295cddf74a5ce033d6b (patch) | |
| tree | 12734e5ca046497e7676079230eb2123c434fd6e /app/views | |
| parent | b1f860818fd1db049ae44f4e9ea1aef93e1e2ea1 (diff) | |
| parent | 0583916d2d9ad19ae342a13ff2a31c9e3bb76547 (diff) | |
| download | gitlab-ce-51c196160adfbdb723fa6295cddf74a5ce033d6b.tar.gz | |
Merge branch 'winh-styled-people-search-bar' into 'master'
Style people in issuable search bar
Closes #30468
See merge request !11402
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index a9a4792faae..be9f9ee29c4 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -26,8 +26,6 @@ %li.input-token %input.form-control.filtered-search{ id: "filtered-search-#{type.to_s}", placeholder: 'Search or filter results...', data: { 'project-id' => @project.id, 'username-params' => @users.to_json(only: [:id, :username]), 'base-endpoint' => namespace_project_path(@project.namespace, @project) } } = icon('filter') - %button.clear-search.hidden{ type: 'button' } - = icon('times') #js-dropdown-hint.filtered-search-input-dropdown-menu.dropdown-menu.hint-dropdown %ul{ data: { dropdown: true } } %li.filter-dropdown-item{ data: { action: 'submit' } } @@ -95,6 +93,8 @@ %span.dropdown-label-box{ style: 'background: {{color}}' } %span.label-title.js-data-value {{title}} + %button.clear-search.hidden{ type: 'button' } + = icon('times') .filter-dropdown-container - if type == :boards - if can?(current_user, :admin_list, @project) |