diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-09-28 12:07:30 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-29 07:19:06 -0500 |
| commit | fa0bf1350eccf5f8d182a79d9655c6e3eb085781 (patch) | |
| tree | 10fcd7ff2b65ae814c6d38b772e4a6d13055e8df | |
| parent | f78c86bbd5c0220e9b408501550a0bfe8f1b5245 (diff) | |
| download | gitlab-ce-fa0bf1350eccf5f8d182a79d9655c6e3eb085781.tar.gz | |
remove instances of <input type="color" /> due to inconsistent browser support
| -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 |