diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-29 13:02:57 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-29 13:02:57 +0000 |
| commit | c6a73b99df34e0a18d99e98bfc430f69327583e7 (patch) | |
| tree | c1a15f5851cb08b3aceef880e436ad5a13473e67 | |
| parent | 570ae33656f24299ca4bb589d0e7043bd120c7a3 (diff) | |
| parent | fa0bf1350eccf5f8d182a79d9655c6e3eb085781 (diff) | |
| download | gitlab-ce-c6a73b99df34e0a18d99e98bfc430f69327583e7.tar.gz | |
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)
See merge request !6576
| -rw-r--r-- | app/views/admin/broadcast_messages/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/labels/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/labels/_form.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index 6b157abf842..f952d2e9aa1 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/app/views/admin/broadcast_messages/_form.html.haml @@ -18,11 +18,11 @@ .form-group.js-toggle-colors-container.hide = f.label :color, "Background Color", class: 'control-label' .col-sm-10 - = f.color_field :color, class: "form-control" + = f.text_field :color, class: "form-control" .form-group.js-toggle-colors-container.hide = f.label :font, "Font Color", class: 'control-label' .col-sm-10 - = f.color_field :font, class: "form-control" + = f.text_field :font, class: "form-control" .form-group = f.label :starts_at, class: 'control-label' .col-sm-10.datetime-controls diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml index 602cfa9b6fc..d5e6bede36a 100644 --- a/app/views/admin/labels/_form.html.haml +++ b/app/views/admin/labels/_form.html.haml @@ -14,7 +14,7 @@ .col-sm-10 .input-group .input-group-addon.label-color-preview - = f.color_field :color, class: "form-control" + = f.text_field :color, class: "form-control" .help-block Choose any color. %br diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml index aa143e54ffe..6ab6ae50389 100644 --- a/app/views/projects/labels/_form.html.haml +++ b/app/views/projects/labels/_form.html.haml @@ -14,7 +14,7 @@ .col-sm-10 .input-group .input-group-addon.label-color-preview - = f.color_field :color, class: "form-control" + = f.text_field :color, class: "form-control" .help-block Choose any color. %br |