From 34609f7ce466ee5b8f077c0f4e938adc04c647a8 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Sun, 3 Feb 2019 23:29:34 +0900 Subject: Fix col-sm-* in forms to keep layout Signed-off-by: Takuya Noguchi --- app/views/admin/labels/_form.html.haml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'app/views/admin/labels/_form.html.haml') diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml index 5e7b4817461..49aa62a5408 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 -- cgit v1.2.1 From d35f986c22e6d75c218d28cbef15a122e2e3273a Mon Sep 17 00:00:00 2001 From: Chris Toynbee Date: Thu, 16 May 2019 09:23:56 +1200 Subject: Fix for #61788 predefined colours dont have descriptive labels --- app/views/admin/labels/_form.html.haml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'app/views/admin/labels/_form.html.haml') diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml index 49aa62a5408..299d0a12e6c 100644 --- a/app/views/admin/labels/_form.html.haml +++ b/app/views/admin/labels/_form.html.haml @@ -24,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' -- cgit v1.2.1