diff options
| author | Ammar Alakkad <aalakkad@gitlab.com> | 2019-07-26 16:06:12 +0300 |
|---|---|---|
| committer | Ammar Alakkad <aalakkad@gitlab.com> | 2019-07-26 16:06:12 +0300 |
| commit | 352385111fb7fffead03b7a474a7feea3fdaebdf (patch) | |
| tree | d0651db53d79576244d7a0a25e6c1192aa28aeb0 /app/views/admin/broadcast_messages | |
| parent | 29a7c83eb30914627163f481de40836de5dc8158 (diff) | |
| download | gitlab-ce-352385111fb7fffead03b7a474a7feea3fdaebdf.tar.gz | |
Add default colors for broadcast messages61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like-red-green-blue
Diffstat (limited to 'app/views/admin/broadcast_messages')
| -rw-r--r-- | app/views/admin/broadcast_messages/_form.html.haml | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index c8ee87c6212..962234d3aea 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/app/views/admin/broadcast_messages/_form.html.haml @@ -17,19 +17,27 @@ required: true, dir: 'auto', data: { preview_path: preview_admin_broadcast_messages_path } - .form-group.row.js-toggle-colors-container - .col-sm-10.offset-sm-2 - = link_to 'Customize colors', '#', class: 'js-toggle-colors-link' - .form-group.row.js-toggle-colors-container.toggle-colors.hide + .form-group.row .col-sm-2.col-form-label - = f.label :color, "Background Color" + = f.label :color, _("Background color") .col-sm-10 - = f.color_field :color, class: "form-control" + .input-group + .input-group-prepend + .input-group-text.label-color-preview{ :style => 'background-color: ' + @broadcast_message.color + '; color: ' + @broadcast_message.font } + = ' '.html_safe + = f.text_field :color, class: "form-control" + .form-text.text-muted + = _('Choose any color.') + %br + = _("Or you can choose one of the suggested colors below") + + = render_suggested_colors + .form-group.row.js-toggle-colors-container.toggle-colors.hide .col-sm-2.col-form-label = f.label :font, "Font Color" .col-sm-10 - = f.color_field :font, class: "form-control" + = f.color_field :font, class: "form-control text-font-color" .form-group.row .col-sm-2.col-form-label = f.label :starts_at, _("Starts at (UTC)") |