Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
7760d8c0
Commit
7760d8c0
authored
Dec 14, 2016
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
25617 Fix placeholder color of todo filters
parent
2f736c6d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+3
-3
changelogs/unreleased/25617-todos-filter-placeholder.yml
changelogs/unreleased/25617-todos-filter-placeholder.yml
+4
-0
No files found.
app/views/dashboard/todos/index.html.haml
View file @
7760d8c0
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
-
if
params
[
:project_id
].
present?
-
if
params
[
:project_id
].
present?
=
hidden_field_tag
(
:project_id
,
params
[
:project_id
])
=
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'
,
=
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
.filter-item.inline
-
if
params
[
:author_id
].
present?
-
if
params
[
:author_id
].
present?
=
hidden_field_tag
(
:author_id
,
params
[
:author_id
])
=
hidden_field_tag
(
:author_id
,
params
[
:author_id
])
...
@@ -42,12 +42,12 @@
...
@@ -42,12 +42,12 @@
-
if
params
[
:type
].
present?
-
if
params
[
:type
].
present?
=
hidden_field_tag
(
:type
,
params
[
:type
])
=
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'
,
=
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
.filter-item.inline.actions-filter
-
if
params
[
:action_id
].
present?
-
if
params
[
:action_id
].
present?
=
hidden_field_tag
(
:action_id
,
params
[
:action_id
])
=
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'
,
=
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
.pull-right
.dropdown.inline.prepend-left-10
.dropdown.inline.prepend-left-10
%button
.dropdown-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.dropdown-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
...
...
changelogs/unreleased/25617-todos-filter-placeholder.yml
0 → 100644
View file @
7760d8c0
---
title
:
25617 Fix placeholder color of todo filters
merge_request
:
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment