Commit c6a73b99 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'fix-html5-color-inputs' into 'master'

Remove instances of HTML5 input type="color" due to inconsistent browser support

## What does this MR do?

`<input type="color" />` renders differently across browsers.  Reverting to `type="text"` where necessary.

## Screenshots (if relevant)

Safari (top) vs Chrome (bottom)
![Screen_Shot_2016-09-28_at_11.53.02_AM](/uploads/f967ed988320cbd2e4357cdfcfe7a813/Screen_Shot_2016-09-28_at_11.53.02_AM.png)

See merge request !6576
parents 570ae336 fa0bf135
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,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.color_field :color, class: "form-control" = f.text_field :color, class: "form-control"
.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.color_field :font, class: "form-control" = f.text_field :font, class: "form-control"
.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
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.col-sm-10 .col-sm-10
.input-group .input-group
.input-group-addon.label-color-preview &nbsp; .input-group-addon.label-color-preview &nbsp;
= f.color_field :color, class: "form-control" = f.text_field :color, class: "form-control"
.help-block .help-block
Choose any color. Choose any color.
%br %br
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.col-sm-10 .col-sm-10
.input-group .input-group
.input-group-addon.label-color-preview &nbsp; .input-group-addon.label-color-preview &nbsp;
= f.color_field :color, class: "form-control" = f.text_field :color, class: "form-control"
.help-block .help-block
Choose any color. Choose any color.
%br %br
......
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