diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-19 15:02:06 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-19 15:02:06 +0000 |
| commit | dbfafd442ee863e6614d0f6765285fcd06f3d843 (patch) | |
| tree | 18604b10beca30f6ab67906df2861223122dec42 | |
| parent | 17eff579655e83affb0eff98ec6ef31b3bc2b6ae (diff) | |
| parent | 1ecfc7d8a53511997ac9b9fe52cde64ddc2a355d (diff) | |
| download | gitlab-ce-dbfafd442ee863e6614d0f6765285fcd06f3d843.tar.gz | |
Merge branch '28139-use-color-input-broadcast-messages' into 'master'
Use color inputs for broadcast messages
Closes #28139
See merge request !12237
| -rw-r--r-- | app/views/admin/broadcast_messages/_form.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/28139-use-color-input-broadcast-messages.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index 2269fb1fd8c..5a4ed1c3a2a 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/app/views/admin/broadcast_messages/_form.html.haml @@ -21,11 +21,11 @@ .form-group.js-toggle-colors-container.hide = f.label :color, "Background Color", class: 'control-label' .col-sm-10 - = f.text_field :color, class: "form-control" + = f.color_field :color, class: "form-control" .form-group.js-toggle-colors-container.hide = f.label :font, "Font Color", class: 'control-label' .col-sm-10 - = f.text_field :font, class: "form-control" + = f.color_field :font, class: "form-control" .form-group = f.label :starts_at, class: 'control-label' .col-sm-10.datetime-controls diff --git a/changelogs/unreleased/28139-use-color-input-broadcast-messages.yml b/changelogs/unreleased/28139-use-color-input-broadcast-messages.yml new file mode 100644 index 00000000000..97ebabaff1c --- /dev/null +++ b/changelogs/unreleased/28139-use-color-input-broadcast-messages.yml @@ -0,0 +1,4 @@ +--- +title: Use color inputs for broadcast messages +merge_request: +author: |