Merge branch '25617-todos-filter-placeholder' into 'master'
25617 Fix placeholder color of todo filters ## What does this MR do? Fixes color of placeholder text on todo filters ## Screenshots (if relevant)  ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25617 See merge request !8094
This commit is contained in:
commit
07c7976d16
|
|
@ -32,7 +32,7 @@
|
|||
- if params[:project_id].present?
|
||||
= hidden_field_tag(:project_id, params[:project_id])
|
||||
= dropdown_tag(project_dropdown_label(params[:project_id], 'Project'), options: { toggle_class: 'js-project-search js-filter-submit', title: 'Filter by project', filter: true, filterInput: 'input#project-search', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit',
|
||||
placeholder: 'Search projects', data: { data: todo_projects_options } })
|
||||
placeholder: 'Search projects', data: { data: todo_projects_options, default_label: 'Project' } })
|
||||
.filter-item.inline
|
||||
- if params[:author_id].present?
|
||||
= hidden_field_tag(:author_id, params[:author_id])
|
||||
|
|
@ -42,12 +42,12 @@
|
|||
- if params[:type].present?
|
||||
= hidden_field_tag(:type, params[:type])
|
||||
= dropdown_tag(todo_types_dropdown_label(params[:type], 'Type'), options: { toggle_class: 'js-type-search js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-type js-filter-submit',
|
||||
data: { data: todo_types_options } })
|
||||
data: { data: todo_types_options, default_label: 'Type' } })
|
||||
.filter-item.inline.actions-filter
|
||||
- if params[:action_id].present?
|
||||
= hidden_field_tag(:action_id, params[:action_id])
|
||||
= dropdown_tag(todo_actions_dropdown_label(params[:action_id], 'Action'), options: { toggle_class: 'js-action-search js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-action js-filter-submit',
|
||||
data: { data: todo_actions_options }})
|
||||
data: { data: todo_actions_options, default_label: 'Action' } })
|
||||
.pull-right
|
||||
.dropdown.inline.prepend-left-10
|
||||
%button.dropdown-toggle{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: 25617 Fix placeholder color of todo filters
|
||||
merge_request:
|
||||
author:
|
||||
Loading…
Reference in New Issue