From e55fcb42909953997e06983887219b717ea13c6e Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiago.mast3r@gmail.com>
Date: Fri, 21 Mar 2014 16:42:30 -0300
Subject: [PATCH] Add colorpicker gemfile and import assets

---
 Gemfile                                | 3 +++
 app/assets/javascripts/application.js  | 1 +
 app/assets/stylesheets/application.css | 1 +
 3 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Gemfile b/Gemfile
index 192df8f..18624ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,6 +48,9 @@ gem "chart-js-rails", "~> 0.0.6"
 # JQueryUI
 gem 'jquery-ui-rails', '~> 4.2.0'
 
+# colorpicker
+gem 'colorpicker', '~> 0.0.5'
+
 # Memcached
 gem "dalli", "~> 2.7.0"
 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 9daa0ce..5a2c4d6 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -18,3 +18,4 @@
 //= require modules
 //= require Chart
 //= require_tree .
+//= require colorpicker
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index f4f49bc..0051445 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,4 +13,5 @@
  *= require jquery.ui.all
  *= require_self
  *= require_tree .
+ *= require colorpicker
  */
--
libgit2 0.21.2