summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-04-11 17:04:01 +0100
committerPhil Hughes <me@iamphill.com>2016-04-11 17:04:01 +0100
commit450a39ededbf93d0bfcec1d4774c3562b87fc190 (patch)
tree367552a1013a11b92c9e16a840a3aeb8d8e649d2
parent4087bd16e8e083550d306fd0c90d2a892b8577bf (diff)
downloadgitlab-ce-issuable-form-alignment.tar.gz
Fixed alignment on issuable new formissuable-form-alignment
Fixes #13802
-rw-r--r--app/assets/stylesheets/pages/issuable.scss6
-rw-r--r--app/views/shared/issuable/_form.html.haml6
2 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 88c1b614c74..999b9a2e79a 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -316,3 +316,9 @@
color: #8c8c8c;
}
}
+
+.issuable-form-padding-top {
+ @media (min-width: $screen-sm-min) {
+ padding-top: 7px;
+ }
+}
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 757a3812deb..1c89a2ee7f3 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -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.
&nbsp;
- if can? current_user, :admin_label, issuable.project