diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-15 15:55:31 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-26 09:03:04 +0100 |
| commit | be521d7d76fac2daa48ad17d330a61d3bbc236ba (patch) | |
| tree | caffb3d83d05b01743780d5f1635980afe8fb314 /app/views/search | |
| parent | 8e4aa6e3910899e3907a9ea76415e616f175767b (diff) | |
| download | gitlab-ce-be521d7d76fac2daa48ad17d330a61d3bbc236ba.tar.gz | |
icons on search bar
Diffstat (limited to 'app/views/search')
| -rw-r--r-- | app/views/search/_filter.html.haml | 4 | ||||
| -rw-r--r-- | app/views/search/_form.html.haml | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/views/search/_filter.html.haml b/app/views/search/_filter.html.haml index 58dac4b7bc0..fd598767393 100644 --- a/app/views/search/_filter.html.haml +++ b/app/views/search/_filter.html.haml @@ -9,7 +9,7 @@ = @group.name - else Any - %b.caret + = icon("chevron-down") .dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-align-right .dropdown-title %span Filter results by group @@ -26,7 +26,7 @@ = @project.name_with_namespace - else Any - %b.caret + = icon("chevron-down") .dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-align-right .dropdown-title %span Filter results by project diff --git a/app/views/search/_form.html.haml b/app/views/search/_form.html.haml index 24115ec3298..3139be1cd37 100644 --- a/app/views/search/_form.html.haml +++ b/app/views/search/_form.html.haml @@ -4,7 +4,12 @@ .search-holder .search-field-holder - = search_field_tag :search, params[:search], placeholder: "Search for projects, issues etc", class: "form-control search-text-input", id: "dashboard_search", autofocus: true, spellcheck: false + = search_field_tag :search, params[:search], placeholder: "Search for projects, issues etc", class: "form-control search-text-input js-search-input", id: "dashboard_search", autofocus: true, spellcheck: false + = icon("search", class: "search-icon") + %button.search-clear.js-search-clear{ class: ("hidden" if !params[:search].present?), type: "button", tabindex: "-1" } + = icon("times-circle") + %span.sr-only + Clear search - unless params[:snippets].eql? 'true' = render 'filter' if current_user - = button_tag 'Search', class: "btn btn-success btn-search" + = button_tag "Search", class: "btn btn-success btn-search" |