From f1fb41146376609864b943436d51bbe7d866e182 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Wed, 5 Dec 2018 09:18:32 +0100 Subject: [PATCH] Correct form field instructions in form group rows --- app/assets/stylesheets/content/_forms.sass | 5 ++++- app/views/settings/_repositories.html.erb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/content/_forms.sass b/app/assets/stylesheets/content/_forms.sass index 334c14ec25..cf79066e84 100644 --- a/app/assets/stylesheets/content/_forms.sass +++ b/app/assets/stylesheets/content/_forms.sass @@ -716,11 +716,14 @@ input[readonly].-clickable .form--grouping-row @include grid-block(10) - align-items: center + align-items: baseline .select2-container margin-bottom: 0 + .form--field-instructions + margin-left: 0px + .form--grouping-row + .form--grouping-row @include grid-offset(2) diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb index df29c44bbf..452a758382 100644 --- a/app/views/settings/_repositories.html.erb +++ b/app/views/settings/_repositories.html.erb @@ -113,6 +113,7 @@ See docs/COPYRIGHT.rdoc for more details.
<%= setting_text_field :commit_fix_keywords, size: 30, label: false %>
+
<%= t(:text_comma_separated) %>
<%= styled_label_tag :settings_commit_fix_status_id, t(:label_applied_status) %> @@ -127,7 +128,6 @@ See docs/COPYRIGHT.rdoc for more details.
-
<%= t(:text_comma_separated) %>
<%= setting_check_box :commit_logtime_enabled %>