Commit 3236bcb2 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch 'yo-gl-new-ui-admin-broadcast-messages' into 'master'

Apply new GitLab UI for input field in admin/broadcast_messages

See merge request gitlab-org/gitlab!52411
parents 1f54acd9 b8f6b376
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :message = f.label :message
.col-sm-10 .col-sm-10
= f.text_area :message, class: "form-control js-autosize js-broadcast-message-message", = f.text_area :message, class: "form-control gl-form-input js-autosize js-broadcast-message-message",
required: true, required: true,
dir: 'auto', dir: 'auto',
data: { preview_path: preview_admin_broadcast_messages_path } data: { preview_path: preview_admin_broadcast_messages_path }
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
.input-group-prepend .input-group-prepend
.input-group-text.label-color-preview{ :style => 'background-color: ' + @broadcast_message.color + '; color: ' + @broadcast_message.font } .input-group-text.label-color-preview{ :style => 'background-color: ' + @broadcast_message.color + '; color: ' + @broadcast_message.font }
= ' '.html_safe = ' '.html_safe
= f.text_field :color, class: "form-control js-broadcast-message-color" = f.text_field :color, class: "form-control gl-form-input js-broadcast-message-color"
.form-text.text-muted .form-text.text-muted
= _('Choose any color.') = _('Choose any color.')
%br %br
...@@ -57,12 +57,12 @@ ...@@ -57,12 +57,12 @@
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :font, "Font Color" = f.label :font, "Font Color"
.col-sm-10 .col-sm-10
= f.color_field :font, class: "form-control text-font-color" = f.color_field :font, class: "form-control gl-form-input text-font-color"
.form-group.row .form-group.row
.col-sm-2.col-form-label .col-sm-2.col-form-label
= f.label :target_path, _('Target Path') = f.label :target_path, _('Target Path')
.col-sm-10 .col-sm-10
= f.text_field :target_path, class: "form-control" = f.text_field :target_path, class: "form-control gl-form-input"
.form-text.text-muted .form-text.text-muted
= _('Paths can contain wildcards, like */welcome') = _('Paths can contain wildcards, like */welcome')
.form-group.row .form-group.row
......
---
title: Apply new GitLab UI for input field in admin/broadcast_messages
merge_request: 52411
author: Yogi (@yo)
type: other
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