Commit ec7b1e67 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'boards-milestone-actions-sticky' into 'master'

Fixed not issue boards milestone actions not sticking to bottom of dropdown

Closes gitlab-ce#32002

See merge request !2102
parents 514fde71 1988ed33
.dropdown-content.board-selector-page-two .board-selector-page-two
%form{ "@submit.prevent" => "submit" } %form{ "@submit.prevent" => "submit" }
%input{ type: "hidden", .dropdown-content
id: "board-milestone", %input{ type: "hidden",
"v-model.number" => "board.milestone_id" } id: "board-milestone",
%div{ "v-if" => "currentPage !== 'milestone'" } "v-model.number" => "board.milestone_id" }
%label.label-light{ for: "board-new-name" } %div{ "v-if" => "currentPage !== 'milestone'" }
Board name %label.label-light{ for: "board-new-name" }
%input.form-control{ type: "text", Board name
id: "board-new-name", %input.form-control{ type: "text",
"v-model" => "board.name" } id: "board-new-name",
.dropdown.board-inner-milestone-dropdown{ ":class" => "{ open: milestoneDropdownOpen }", "v-model" => "board.name" }
"v-if" => "currentPage === 'new'" } .dropdown.board-inner-milestone-dropdown{ ":class" => "{ open: milestoneDropdownOpen }",
%label.label-light{ for: "board-milestone" } "v-if" => "currentPage === 'new'" }
Board milestone %label.label-light{ for: "board-milestone" }
%button.dropdown-menu-toggle.wide{ type: "button", Board milestone
"@click.stop.prevent" => "loadMilestones($event)" } %button.dropdown-menu-toggle.wide{ type: "button",
{{ milestoneToggleText }} "@click.stop.prevent" => "loadMilestones($event)" }
= icon("chevron-down") {{ milestoneToggleText }}
.dropdown-menu.dropdown-menu-selectable{ "v-if" => "milestoneDropdownOpen", = icon("chevron-down")
ref: "milestoneDropdown" } .dropdown-menu.dropdown-menu-selectable{ "v-if" => "milestoneDropdownOpen",
.dropdown-content ref: "milestoneDropdown" }
%ul .dropdown-content
%li{ "v-for" => "milestone in extraMilestones" } %ul
%a{ href: "#", %li{ "v-for" => "milestone in extraMilestones" }
":class" => "{ 'is-active': milestone.id === board.milestone_id }", %a{ href: "#",
"@click.stop.prevent" => "selectMilestone(milestone)" } ":class" => "{ 'is-active': milestone.id === board.milestone_id }",
{{ milestone.title }} "@click.stop.prevent" => "selectMilestone(milestone)" }
%li.divider {{ milestone.title }}
%li{ "v-for" => "milestone in milestones" } %li.divider
%a{ href: "#", %li{ "v-for" => "milestone in milestones" }
":class" => "{ 'is-active': milestone.id === board.milestone_id }", %a{ href: "#",
"@click.stop.prevent" => "selectMilestone(milestone)" } ":class" => "{ 'is-active': milestone.id === board.milestone_id }",
{{ milestone.title }} "@click.stop.prevent" => "selectMilestone(milestone)" }
= dropdown_loading {{ milestone.title }}
%span = dropdown_loading
Only show issues scheduled for the selected milestone %span
%board-milestone-select{ "v-if" => "currentPage == 'milestone'", Only show issues scheduled for the selected milestone
":milestone-path" => "milestonePath", %board-milestone-select{ "v-if" => "currentPage == 'milestone'",
":select-milestone" => "selectMilestone", ":milestone-path" => "milestonePath",
":board" => "board" } ":select-milestone" => "selectMilestone",
.clearfix.prepend-top-10 ":board" => "board" }
.dropdown-footer
%button.btn.btn-primary.pull-left{ type: "submit", %button.btn.btn-primary.pull-left{ type: "submit",
":disabled" => "submitDisabled", ":disabled" => "submitDisabled",
"ref" => "'submit-btn'" } "ref" => "'submit-btn'" }
......
---
title: Fixed edit issue boards milestone action buttons not sticking to bottom of
dropdown
merge_request:
author:
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