remove dependency on font-awesome for a while

leikind · Aug 28, 2015 · ca1c3c8 · ca1c3c8
1 parent 6b3ddd6
commit ca1c3c8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -94,6 +94,7 @@ WARNING: Since 3.2.pre2 WiceGrid is not compatible with `will_paginate` because
 Add the following to your Gemfile:
 
 ```
+gem 'font-awesome-sass', '~> 4.3.0'
 gem "wice_grid", '3.6.0.pre2'
 ```
 

diff --git a/lib/wice_grid.rb b/lib/wice_grid.rb
@@ -23,10 +23,10 @@
 require 'wice/columns/common_rails_date_datetime_conditions_generator_mixin.rb'
 require 'kaminari.rb'
 
-unless Kernel.const_defined?(:FontAwesome)
-  gem 'font-awesome-sass'
-  require 'font-awesome-sass.rb'
-end
+# unless Kernel.const_defined?(:FontAwesome)
+#   gem 'font-awesome-sass'
+#   require 'font-awesome-sass.rb'
+# end
 
 ActionController::Base.send(:helper_method, :wice_grid_custom_filter_params)
 

diff --git a/wice_grid.gemspec b/wice_grid.gemspec
@@ -19,11 +19,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord',      ['> 3.2']
   s.add_dependency 'kaminari',          ['~> 0.16']
   s.add_dependency 'coffee-rails',      ['> 3.2']
-  s.add_dependency 'font-awesome-sass', ['~> 4.3']
 
-  s.add_runtime_dependency 'sass', '~> 3.2'
-
-  s.add_development_dependency 'sass-rails'
+  # s.add_dependency 'font-awesome-sass', ['~> 4.3']
+  # s.add_runtime_dependency 'sass', '~> 3.2'
+  # s.add_development_dependency 'sass-rails'
 
   s.add_development_dependency('rake',  '~> 10.1')
   s.add_development_dependency('rspec', '~> 3.2.0')