From 977b9c0c3fc5e01d5b65b88feef57b43309ffea7 Mon Sep 17 00:00:00 2001 From: "Guilherme J. Tramontina" Date: Wed, 20 Aug 2014 02:16:57 -0300 Subject: [PATCH] Add Spectrum as input[type=color] polyfill. --- Gemfile | 3 ++- Gemfile.lock | 3 +++ app/assets/javascripts/application.js.coffee.erb | 1 + app/assets/stylesheets/application.css.scss.erb | 15 +++++++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 7b9bbd0c..160f41a2 100644 --- a/Gemfile +++ b/Gemfile @@ -56,6 +56,8 @@ gem 'uglifier', '>= 1.3.0' gem 'select2-rails', '~> 3.5.4' gem 'jquery-rails', '~> 3.1.0' gem 'ace-rails-ap', '~> 2.0.1' +gem 'spectrum-rails' + # geokit-rails doesn't work with geokit 1.8.X but it specifies ~> 1.5 # in its own Gemfile. @@ -123,4 +125,3 @@ else gem 'unicorn', platform: :ruby_18 gem 'rails_12factor', platform: :ruby_18 end - diff --git a/Gemfile.lock b/Gemfile.lock index 6cfc8531..f2c7e50a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -290,6 +290,8 @@ GEM simplecov-html (0.8.0) slack-notifier (0.5.0) slop (3.5.0) + spectrum-rails (1.3.4) + railties (>= 3.1) sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) @@ -415,6 +417,7 @@ DEPENDENCIES select2-rails (~> 3.5.4) shoulda-matchers slack-notifier (~> 0.5.0) + spectrum-rails therubyracer (~> 0.12.1) twilio-ruby (~> 3.11.5) twitter (~> 5.8.0) diff --git a/app/assets/javascripts/application.js.coffee.erb b/app/assets/javascripts/application.js.coffee.erb index 06b345a5..6ac542d6 100644 --- a/app/assets/javascripts/application.js.coffee.erb +++ b/app/assets/javascripts/application.js.coffee.erb @@ -6,6 +6,7 @@ #= require json2 #= require jquery.json-editor #= require latlon_and_geo +#= require spectrum #= require ./worker-checker #= require_self diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 2cbff3e3..a779e5fe 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -12,6 +12,7 @@ *= require select2-bootstrap *= require jquery.json-editor *= require rickshaw + *= require spectrum *= require_tree . *= require_self */ @@ -186,3 +187,17 @@ h2 .scenario, a span.label.scenario { .color-success { color: #5cb85c; } + +.form-group { + .sp-replacer { + @extend .form-control; + } + + .sp-preview { + width: 100%; + } + + .sp-dd { + display: none; + } +}