Commit 3a602c84 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #9007 from atomaka/atomaka/feature/broadcast-message-colors

Complete transition to using color_field for selecting colors
parents fc4af9b1 83b5a9ae
...@@ -21,13 +21,11 @@ ...@@ -21,13 +21,11 @@
.form-group.js-toggle-colors-container.hide .form-group.js-toggle-colors-container.hide
= f.label :color, "Background Color", class: 'control-label' = f.label :color, "Background Color", class: 'control-label'
.col-sm-10 .col-sm-10
= f.text_field :color, placeholder: "#AA33EE", class: "form-control" = f.color_field :color, value: "#AA33EE", class: "form-control"
.light 6 character hex values starting with a # sign.
.form-group.js-toggle-colors-container.hide .form-group.js-toggle-colors-container.hide
= f.label :font, "Font Color", class: 'control-label' = f.label :font, "Font Color", class: 'control-label'
.col-sm-10 .col-sm-10
= f.text_field :font, placeholder: "#224466", class: "form-control" = f.color_field :font, value: "#224466", class: "form-control"
.light 6 character hex values starting with a # sign.
.form-group .form-group
= f.label :starts_at, class: 'control-label' = f.label :starts_at, class: 'control-label'
.col-sm-10.datetime-controls .col-sm-10.datetime-controls
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
.col-sm-10 .col-sm-10
.input-group .input-group
.input-group-addon.label-color-preview   .input-group-addon.label-color-preview  
= f.color_field :color, placeholder: "#AA33EE", class: "form-control" = f.color_field :color, value: "#AA33EE", class: "form-control"
.help-block .help-block
6 character hex values starting with a # sign. Choose any color.
%br %br
Or you can choose one of suggested colors below Or you can choose one of suggested colors below
......
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