Commit f2082edb6058b5ff665ff84c465b6d75f58b6c54
1 parent
49fa9907
Exists in
master
and in
4 other branches
use control-group classes for inline forms in issues/mr
Showing
2 changed files
with
14 additions
and
14 deletions
Show diff stats
app/views/projects/issues/_form.html.haml
| @@ -8,18 +8,18 @@ | @@ -8,18 +8,18 @@ | ||
| 8 | %br | 8 | %br |
| 9 | .ui-box.ui-box-show | 9 | .ui-box.ui-box-show |
| 10 | .ui-box-head | 10 | .ui-box-head |
| 11 | - .clearfix | 11 | + .control-group |
| 12 | = f.label :title do | 12 | = f.label :title do |
| 13 | %strong= "Subject *" | 13 | %strong= "Subject *" |
| 14 | - .input | 14 | + .controls |
| 15 | = f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true | 15 | = f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true |
| 16 | .ui-box-body | 16 | .ui-box-body |
| 17 | - .clearfix | 17 | + .control-group |
| 18 | .issue_assignee.pull-left | 18 | .issue_assignee.pull-left |
| 19 | = f.label :assignee_id do | 19 | = f.label :assignee_id do |
| 20 | %i.icon-user | 20 | %i.icon-user |
| 21 | Assign to | 21 | Assign to |
| 22 | - .input | 22 | + .controls |
| 23 | .pull-left | 23 | .pull-left |
| 24 | = f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'}) | 24 | = f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'}) |
| 25 | .pull-right | 25 | .pull-right |
| @@ -29,20 +29,20 @@ | @@ -29,20 +29,20 @@ | ||
| 29 | = f.label :milestone_id do | 29 | = f.label :milestone_id do |
| 30 | %i.icon-time | 30 | %i.icon-time |
| 31 | Milestone | 31 | Milestone |
| 32 | - .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'}) | 32 | + .controls= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'}) |
| 33 | 33 | ||
| 34 | .ui-box-bottom | 34 | .ui-box-bottom |
| 35 | - .clearfix | 35 | + .control-group |
| 36 | = f.label :label_list do | 36 | = f.label :label_list do |
| 37 | %i.icon-tag | 37 | %i.icon-tag |
| 38 | Labels | 38 | Labels |
| 39 | - .input | 39 | + .controls |
| 40 | = f.text_field :label_list, maxlength: 2000, class: "xxlarge" | 40 | = f.text_field :label_list, maxlength: 2000, class: "xxlarge" |
| 41 | %p.hint Separate labels with commas. | 41 | %p.hint Separate labels with commas. |
| 42 | 42 | ||
| 43 | - .clearfix | 43 | + .control-group |
| 44 | = f.label :description, "Details" | 44 | = f.label :description, "Details" |
| 45 | - .input | 45 | + .controls |
| 46 | = f.text_area :description, class: "xxlarge js-gfm-input", rows: 14 | 46 | = f.text_area :description, class: "xxlarge js-gfm-input", rows: 14 |
| 47 | %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. | 47 | %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. |
| 48 | 48 |
app/views/projects/merge_requests/_form.html.haml
| @@ -31,21 +31,21 @@ | @@ -31,21 +31,21 @@ | ||
| 31 | %i.icon-paper-clip | 31 | %i.icon-paper-clip |
| 32 | Details | 32 | Details |
| 33 | .merge-request-form-info | 33 | .merge-request-form-info |
| 34 | - .clearfix | 34 | + .control-group |
| 35 | = f.label :title do | 35 | = f.label :title do |
| 36 | %strong= "Title *" | 36 | %strong= "Title *" |
| 37 | - .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true | ||
| 38 | - .clearfix | 37 | + .controls= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true |
| 38 | + .control-group | ||
| 39 | .left | 39 | .left |
| 40 | = f.label :assignee_id do | 40 | = f.label :assignee_id do |
| 41 | %i.icon-user | 41 | %i.icon-user |
| 42 | Assign to | 42 | Assign to |
| 43 | - .input= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'}) | 43 | + .controls= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'}) |
| 44 | .left | 44 | .left |
| 45 | = f.label :milestone_id do | 45 | = f.label :milestone_id do |
| 46 | %i.icon-time | 46 | %i.icon-time |
| 47 | Milestone | 47 | Milestone |
| 48 | - .input= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'}) | 48 | + .controls= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'}) |
| 49 | 49 | ||
| 50 | 50 | ||
| 51 | .form-actions | 51 | .form-actions |