Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-27 18:31:52 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-31 12:46:37 +0300
commit26b2790eef6fe25fb36afaaff16c0396d4097ba2 (patch)
tree6bcfd473eddda7777871c6f6d6e3003e840d1eb8 /app/views/projects/labels
parentbdb1f7903d2118fdb83d0494de3215af9c4a2ed0 (diff)
Improve labels search UI on project labels page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/labels')
-rw-r--r--app/views/projects/labels/index.html.haml10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 95aa35bd70b..251eda6dbf8 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -15,10 +15,16 @@
.nav-text
= _('Labels can be applied to issues and merge requests.')
- if can_admin_label
+ %br
= _('Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging.')
- = form_tag project_labels_path(@project), method: :get do
- = search_field_tag :search, params[:search], { placeholder: _('Filter labels by name or description'), id: 'label-search', class: 'form-control', spellcheck: false }
+ .nav-controls
+ = form_tag project_labels_path(@project), method: :get do
+ .input-group
+ = search_field_tag :search, params[:search], { placeholder: _('Filter'), id: 'label-search', class: 'form-control search-text-input input-short', spellcheck: false }
+ %span.input-group-append
+ %button.btn{ type: "submit", "aria-label" => "Submit search" }
+ = icon("search")
.labels-container.prepend-top-10
- if can_admin_label