diff options
| author | winh <winnie@gitlab.com> | 2017-05-30 12:45:33 +0200 |
|---|---|---|
| committer | winh <winnie@gitlab.com> | 2017-06-02 14:42:03 +0200 |
| commit | f032731e47f2ce1c2feb6ff866754202efb6844b (patch) | |
| tree | f1f36da0af7eee4d80759cf373b0698499ea237b | |
| parent | b22970648efd384fc3dbda379e1506a336d154f8 (diff) | |
| download | gitlab-ce-f032731e47f2ce1c2feb6ff866754202efb6844b.tar.gz | |
Move clear search button out of issuable search bar
| -rw-r--r-- | app/assets/stylesheets/framework/filters.scss | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index 90051ffe753..52c9c3c88d4 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -239,7 +239,7 @@ width: 35px; background-color: $white-light; border: none; - position: absolute; + position: static; right: 0; height: 100%; outline: none; 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) |