diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-06-10 08:56:25 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-06-10 08:56:25 +0100 |
| commit | 51713627f61b5897c0697f7574d8c3d7c3e93c41 (patch) | |
| tree | 21cf681e4c976bd2012af21ba749f952624de9b5 /app/views/admin/labels/_form.html.haml | |
| parent | 6a4aa3f9be8b31e5d76750d40f15f5fef2c792af (diff) | |
| parent | e3072811475dcd563911a78fce85263b693d3fd6 (diff) | |
| download | gitlab-ce-51713627f61b5897c0697f7574d8c3d7c3e93c41.tar.gz | |
Merge remote-tracking branch 'origin/master' into patch-56
Diffstat (limited to 'app/views/admin/labels/_form.html.haml')
| -rw-r--r-- | app/views/admin/labels/_form.html.haml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml index 5e7b4817461..299d0a12e6c 100644 --- a/app/views/admin/labels/_form.html.haml +++ b/app/views/admin/labels/_form.html.haml @@ -2,15 +2,18 @@ = form_errors(@label) .form-group.row - = f.label :title, class: 'col-form-label col-sm-2' + .col-sm-2.col-form-label + = f.label :title .col-sm-10 = f.text_field :title, class: "form-control", required: true .form-group.row - = f.label :description, class: 'col-form-label col-sm-2' + .col-sm-2.col-form-label + = f.label :description .col-sm-10 = f.text_field :description, class: "form-control js-quick-submit" .form-group.row - = f.label :color, _("Background color"), class: 'col-form-label col-sm-2' + .col-sm-2.col-form-label + = f.label :color, _("Background color") .col-sm-10 .input-group .input-group-prepend @@ -21,10 +24,7 @@ %br = _("Or you can choose one of the suggested colors below") - .suggest-colors - - suggested_colors.each do |color| - = link_to '#', style: "background-color: #{color}", data: { color: color } do - + = render_suggested_colors .form-actions = f.submit _('Save'), class: 'btn btn-success js-save-button' |