Commit cce3194c authored by Simon Knox's avatar Simon Knox

Merge branch 'restyle-hints-on-appearance-page' into 'master'

Use muted color for help texts on appearance admin page

See merge request gitlab-org/gitlab!75871
parents 6c3646d6 c17e794b
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
%hr %hr
= f.hidden_field :header_logo_cache = f.hidden_field :header_logo_cache
= f.file_field :header_logo, class: "", accept: 'image/*' = f.file_field :header_logo, class: "", accept: 'image/*'
.hint .form-text.text-muted
= _('Maximum file size is 1MB. Pages are optimized for a 28px tall header logo') = _('Maximum file size is 1MB. Pages are optimized for a 28px tall header logo')
%hr %hr
.row .row
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
%hr %hr
= f.hidden_field :favicon_cache = f.hidden_field :favicon_cache
= f.file_field :favicon, class: '', accept: 'image/*' = f.file_field :favicon, class: '', accept: 'image/*'
.hint .form-text.text-muted
= _("Maximum file size is 1 MB. Image size must be 32 x 32 pixels. Allowed image formats are %{favicon_extension_whitelist}.") % { favicon_extension_whitelist: favicon_extension_whitelist } = _("Maximum file size is 1 MB. Image size must be 32 x 32 pixels. Allowed image formats are %{favicon_extension_whitelist}.") % { favicon_extension_whitelist: favicon_extension_whitelist }
%br %br
= _("Images with incorrect dimensions are not resized automatically, and may result in unexpected behavior.") = _("Images with incorrect dimensions are not resized automatically, and may result in unexpected behavior.")
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
.form-group .form-group
= f.label :description, class: 'col-form-label label-bold' = f.label :description, class: 'col-form-label label-bold'
= f.text_area :description, class: "form-control gl-form-input", rows: 10 = f.text_area :description, class: "form-control gl-form-input", rows: 10
.hint .form-text.text-muted
= parsed_with_gfm = parsed_with_gfm
.form-group .form-group
= f.label :logo, class: 'col-form-label label-bold pt-0' = f.label :logo, class: 'col-form-label label-bold pt-0'
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
%hr %hr
= f.hidden_field :logo_cache = f.hidden_field :logo_cache
= f.file_field :logo, class: "", accept: 'image/*' = f.file_field :logo, class: "", accept: 'image/*'
.hint .form-text.text-muted
= _('Maximum file size is 1MB. Pages are optimized for a 640x360 px logo.') = _('Maximum file size is 1MB. Pages are optimized for a 640x360 px logo.')
%hr %hr
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
= f.label :new_project_guidelines, class: 'col-form-label label-bold' = f.label :new_project_guidelines, class: 'col-form-label label-bold'
%p %p
= f.text_area :new_project_guidelines, class: "form-control gl-form-input", rows: 10 = f.text_area :new_project_guidelines, class: "form-control gl-form-input", rows: 10
.hint .form-text.text-muted
= parsed_with_gfm = parsed_with_gfm
%hr %hr
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
= f.label :profile_image_guidelines, class: 'col-form-label label-bold' = f.label :profile_image_guidelines, class: 'col-form-label label-bold'
%p %p
= f.text_area :profile_image_guidelines, class: "form-control gl-form-input", rows: 10 = f.text_area :profile_image_guidelines, class: "form-control gl-form-input", rows: 10
.hint .form-text.text-muted
= parsed_with_gfm = parsed_with_gfm
.gl-mt-3.gl-mb-3 .gl-mt-3.gl-mb-3
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
= form.label :email_header_and_footer_enabled, class: 'label-bold' do = form.label :email_header_and_footer_enabled, class: 'label-bold' do
= _('Enable header and footer in emails') = _('Enable header and footer in emails')
.hint .form-text.text-muted
= _('Add header and footer to emails. Please note that color settings will only be applied within the application interface') = _('Add header and footer to emails. Please note that color settings will only be applied within the application interface')
.form-group.js-toggle-colors-container .form-group.js-toggle-colors-container
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment