Commit fcc88e52 authored by Phil Hughes's avatar Phil Hughes

Fixed some styling issues in new list dropdown

parent 87cab11c
...@@ -23,6 +23,10 @@ $(() => { ...@@ -23,6 +23,10 @@ $(() => {
return $li.append($a.prepend($labelColor)); return $li.append($a.prepend($labelColor));
}, },
search: {
fields: ['title']
},
filterable: true,
selectable: true, selectable: true,
clicked: (label, $el, e) => { clicked: (label, $el, e) => {
e.preventDefault(); e.preventDefault();
......
...@@ -4,13 +4,20 @@ ...@@ -4,13 +4,20 @@
.dropdown-menu-issues-board-new { .dropdown-menu-issues-board-new {
width: 320px; width: 320px;
.dropdown-content {
max-height: 150px;
}
} }
.issue-board-dropdown-content { .issue-board-dropdown-content {
padding: 0px 8px; margin: 0 8px 10px 8px;
padding-bottom: 10px;
border-bottom: 1px solid $dropdown-divider-color;
> p { > p {
margin: 0; margin: 0;
font-size: 14px;
color: #9c9c9c; color: #9c9c9c;
} }
} }
......
...@@ -34,11 +34,7 @@ ...@@ -34,11 +34,7 @@
%button.btn.btn-create.js-new-board-list{ type: "button", data: { toggle: "dropdown", labels: labels_filter_path } } %button.btn.btn-create.js-new-board-list{ type: "button", data: { toggle: "dropdown", labels: labels_filter_path } }
Create new list Create new list
.dropdown-menu.dropdown-menu-paging.dropdown-menu-align-right.dropdown-menu-issues-board-new .dropdown-menu.dropdown-menu-paging.dropdown-menu-align-right.dropdown-menu-issues-board-new
= dropdown_title("Create a new list") = render partial: "shared/issuable/label_page_default", locals: { show_footer: true, show_create: true, show_boards_content: true, title: "Create a new list" }
.issue-board-dropdown-content
%p
Add a list to issue boards by selecting a label below. The list will automatically be populated with issues that have that label. To create a list for a label that doesn't exist yet, simply create the label below.
= render partial: "shared/issuable/label_page_default", locals: { show_title: false, show_footer: true, show_create: true }
- if can?(current_user, :admin_label, @project) - if can?(current_user, :admin_label, @project)
= render partial: "shared/issuable/label_page_create" = render partial: "shared/issuable/label_page_create"
= dropdown_loading = dropdown_loading
......
- title = local_assigns.fetch(:title, 'Assign labels') - title = local_assigns.fetch(:title, 'Assign labels')
- show_create = local_assigns.fetch(:show_create, true) - show_create = local_assigns.fetch(:show_create, true)
- show_footer = local_assigns.fetch(:show_footer, true) - show_footer = local_assigns.fetch(:show_footer, true)
- show_title = local_assigns.fetch(:show_title, true)
- filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels') - filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels')
- show_boards_content = local_assigns.fetch(:show_boards_content, false)
.dropdown-page-one .dropdown-page-one
- if show_title
= dropdown_title(title) = dropdown_title(title)
- if show_boards_content
.issue-board-dropdown-content
%p
Add a list to issue boards by selecting a label below. The list will automatically be populated with issues that have that label. To create a list for a label that doesn't exist yet, simply create the label below.
= dropdown_filter(filter_placeholder) = dropdown_filter(filter_placeholder)
= dropdown_content = dropdown_content
- if @project && show_footer - if @project && show_footer
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment