Commit 90ffed5c authored by Clement Ho's avatar Clement Ho

Merge branch '56764-poor-ui-on-milestone-validation-error-page' into 'master'

Fix CSS grid on a new Project/Group Milestone

Closes #56764

See merge request gitlab-org/gitlab-ce!24614
parents 1414cfae 95ede02c
= form_for [@group, @milestone], html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f| = form_for [@group, @milestone], html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f|
.row
= form_errors(@milestone) = form_errors(@milestone)
.row
.col-md-6 .col-md-6
.form-group.row .form-group.row
= f.label :title, "Title", class: "col-form-label col-sm-2" .col-form-label.col-sm-2
= f.label :title, "Title"
.col-sm-10 .col-sm-10
= f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true = f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true
.form-group.row.milestone-description .form-group.row.milestone-description
= f.label :description, "Description", class: "col-form-label col-sm-2" .col-form-label.col-sm-2
= f.label :description, "Description"
.col-sm-10 .col-sm-10
= render layout: 'projects/md_preview', locals: { url: group_preview_markdown_path } do = render layout: 'projects/md_preview', locals: { url: group_preview_markdown_path } do
= render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...', supports_autocomplete: false = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...', supports_autocomplete: false
.clearfix .clearfix
.error-alert .error-alert
= render "shared/milestones/form_dates", f: f = render "shared/milestones/form_dates", f: f
.form-actions .form-actions
......
...@@ -5,11 +5,13 @@ ...@@ -5,11 +5,13 @@
.row .row
.col-md-6 .col-md-6
.form-group.row .form-group.row
= f.label :title, _('Title'), class: 'col-form-label col-sm-2' .col-form-label.col-sm-2
= f.label :title, _('Title')
.col-sm-10 .col-sm-10
= f.text_field :title, maxlength: 255, class: 'qa-milestone-title form-control', required: true, autofocus: true = f.text_field :title, maxlength: 255, class: 'qa-milestone-title form-control', required: true, autofocus: true
.form-group.row.milestone-description .form-group.row.milestone-description
= f.label :description, _('Description'), class: 'col-form-label col-sm-2' .col-form-label.col-sm-2
= f.label :description, _('Description')
.col-sm-10 .col-sm-10
= render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project) } do = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project) } do
= render 'projects/zen', f: f, attr: :description, classes: 'qa-milestone-description note-textarea', placeholder: _('Write milestone description...') = render 'projects/zen', f: f, attr: :description, classes: 'qa-milestone-description note-textarea', placeholder: _('Write milestone description...')
......
.col-md-6 .col-md-6
.form-group.row .form-group.row
= f.label :start_date, "Start Date", class: "col-form-label col-sm-2" .col-form-label.col-sm-2
= f.label :start_date, "Start Date"
.col-sm-10 .col-sm-10
= f.text_field :start_date, class: "datepicker form-control", placeholder: "Select start date", autocomplete: 'off' = f.text_field :start_date, class: "datepicker form-control", placeholder: "Select start date", autocomplete: 'off'
%a.inline.float-right.prepend-top-5.js-clear-start-date{ href: "#" } Clear start date %a.inline.float-right.prepend-top-5.js-clear-start-date{ href: "#" } Clear start date
.form-group.row .form-group.row
= f.label :due_date, "Due Date", class: "col-form-label col-sm-2" .col-form-label.col-sm-2
= f.label :due_date, "Due Date"
.col-sm-10 .col-sm-10
= f.text_field :due_date, class: "datepicker form-control", placeholder: "Select due date", autocomplete: 'off' = f.text_field :due_date, class: "datepicker form-control", placeholder: "Select due date", autocomplete: 'off'
%a.inline.float-right.prepend-top-5.js-clear-due-date{ href: "#" } Clear due date %a.inline.float-right.prepend-top-5.js-clear-due-date{ href: "#" } Clear due date
---
title: Fix CSS grid on a new Project/Group Milestone
merge_request: 24614
author: Takuya Noguchi
type: fixed
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