Skip to content

Commit

Permalink
Switched from font-awesome-sass-rails to font-awesome-rails
Browse files Browse the repository at this point in the history
* Font-Awesome dropped core sass support in
  3.1.x. font-awesome-sass-rails is stuck on 3.0 and is unlikely to be
  kept up to date
* The font-awesome-rails tracks Font-Awesome core very closely.
* The font-awesome-rails gem works with Rails 4 and has a test suite

Closes railsadminteam#1651
  • Loading branch information
rmm5t committed Jun 2, 2013
1 parent 71bdd83 commit fc314ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/rails_admin/engine.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'bootstrap-sass'
require 'font-awesome-sass-rails'
require 'font-awesome-rails'
require 'jquery-rails'
require 'jquery-ui-rails'
require 'kaminari'
Expand Down
2 changes: 1 addition & 1 deletion rails_admin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'bootstrap-sass', '~> 2.2'
spec.add_dependency 'builder', '~> 3.0'
spec.add_dependency 'coffee-rails', '~> 3.1'
spec.add_dependency 'font-awesome-sass-rails', ['~> 3.0', '>= 3.0.0.1']
spec.add_dependency 'font-awesome-rails', ['~> 3.0']
spec.add_dependency 'haml', '~> 4.0'
spec.add_dependency 'jquery-rails', '~> 2.1'
spec.add_dependency 'jquery-ui-rails', '~> 3.0'
Expand Down

0 comments on commit fc314ef

Please sign in to comment.