Merge branch 'issuable-form-alignment' into 'master'
Fixed alignment on issuable new form Fixes #13802 ![Screen_Shot_2016-04-11_at_17.03.29](/uploads/d359580e693284d4b694d8158d4f736e/Screen_Shot_2016-04-11_at_17.03.29.png) See merge request !3661
This commit is contained in:
commit
e17f79fdfa
|
@ -322,3 +322,9 @@
|
|||
color: #8c8c8c;
|
||||
}
|
||||
}
|
||||
|
||||
.issuable-form-padding-top {
|
||||
@media (min-width: $screen-sm-min) {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -70,13 +70,13 @@
|
|||
- if can? current_user, :admin_milestone, issuable.project
|
||||
= link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank
|
||||
.form-group
|
||||
- has_labels = issuable.project.labels.any?
|
||||
= f.label :label_ids, "Labels", class: 'control-label'
|
||||
.col-sm-10
|
||||
- if issuable.project.labels.any?
|
||||
.col-sm-10{ class: ('issuable-form-padding-top' if !has_labels) }
|
||||
- if has_labels
|
||||
= f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
|
||||
{ selected: issuable.label_ids }, multiple: true, class: 'select2', data: { placeholder: "Select labels" }
|
||||
- else
|
||||
.prepend-top-10
|
||||
%span.light No labels yet.
|
||||
|
||||
- if can? current_user, :admin_label, issuable.project
|
||||
|
|
Loading…
Reference in New Issue