Commit f2082edb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

use control-group classes for inline forms in issues/mr

parent 49fa9907
...@@ -8,18 +8,18 @@ ...@@ -8,18 +8,18 @@
%br %br
.ui-box.ui-box-show .ui-box.ui-box-show
.ui-box-head .ui-box-head
.clearfix .control-group
= f.label :title do = f.label :title do
%strong= "Subject *" %strong= "Subject *"
.input .controls
= f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true = f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true
.ui-box-body .ui-box-body
.clearfix .control-group
.issue_assignee.pull-left .issue_assignee.pull-left
= f.label :assignee_id do = f.label :assignee_id do
%i.icon-user %i.icon-user
Assign to Assign to
.input .controls
.pull-left .pull-left
= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'}) = f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'})
.pull-right .pull-right
...@@ -29,20 +29,20 @@ ...@@ -29,20 +29,20 @@
= f.label :milestone_id do = f.label :milestone_id do
%i.icon-time %i.icon-time
Milestone Milestone
.input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'}) .controls= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
.ui-box-bottom .ui-box-bottom
.clearfix .control-group
= f.label :label_list do = f.label :label_list do
%i.icon-tag %i.icon-tag
Labels Labels
.input .controls
= f.text_field :label_list, maxlength: 2000, class: "xxlarge" = f.text_field :label_list, maxlength: 2000, class: "xxlarge"
%p.hint Separate labels with commas. %p.hint Separate labels with commas.
.clearfix .control-group
= f.label :description, "Details" = f.label :description, "Details"
.input .controls
= f.text_area :description, class: "xxlarge js-gfm-input", rows: 14 = f.text_area :description, class: "xxlarge js-gfm-input", rows: 14
%p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
......
...@@ -31,21 +31,21 @@ ...@@ -31,21 +31,21 @@
%i.icon-paper-clip %i.icon-paper-clip
Details Details
.merge-request-form-info .merge-request-form-info
.clearfix .control-group
= f.label :title do = f.label :title do
%strong= "Title *" %strong= "Title *"
.input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true .controls= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
.clearfix .control-group
.left .left
= f.label :assignee_id do = f.label :assignee_id do
%i.icon-user %i.icon-user
Assign to Assign to
.input= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'}) .controls= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
.left .left
= f.label :milestone_id do = f.label :milestone_id do
%i.icon-time %i.icon-time
Milestone Milestone
.input= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'}) .controls= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
.form-actions .form-actions
......
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