Vendorize font-awesome. Closes #3039

Based on https://github.com/bokmann/font-awesome-rails/tree/v4.7.0.5
railsadminteam · Jun 1, 2019 · 6191187 · 6191187
1 parent 4fd5c8c
commit 6191187
Show file tree

Hide file tree

Showing 10 changed files with 5,014 additions and 3 deletions.
diff --git a/app/assets/stylesheets/rails_admin/rails_admin.scss.erb b/app/assets/stylesheets/rails_admin/rails_admin.scss.erb
@@ -61,7 +61,7 @@
 
 /*** Font-awesome ***/
 
-@import 'font-awesome';
+@import 'rails_admin/font-awesome';
 @import 'rails_admin/base/font-awesome-4-compability';
 
 /***  Bootstrap Theming  ***/

diff --git a/lib/rails_admin/engine.rb b/lib/rails_admin/engine.rb
@@ -1,4 +1,3 @@
-require 'font-awesome-rails'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'kaminari'

diff --git a/rails_admin.gemspec b/rails_admin.gemspec
@@ -7,7 +7,6 @@ Gem::Specification.new do |spec|
   # If you add a dependency, please maintain alphabetical order
   spec.add_dependency 'builder', '~> 3.1'
   spec.add_dependency 'coffee-rails', ['>= 4.0', '< 6']
-  spec.add_dependency 'font-awesome-rails', ['>= 3.0', '< 5']
   spec.add_dependency 'haml', '>= 4.0', '< 6'
   spec.add_dependency 'jquery-rails', ['>= 3.0', '< 5']
   spec.add_dependency 'jquery-ui-rails', ['>= 5.0', '< 7']

diff --git a/vendor/assets/fonts/rails_admin/FontAwesome.otf b/vendor/assets/fonts/rails_admin/FontAwesome.otf
diff --git a/vendor/assets/fonts/rails_admin/fontawesome-webfont.eot b/vendor/assets/fonts/rails_admin/fontawesome-webfont.eot
diff --git a/vendor/assets/fonts/rails_admin/fontawesome-webfont.svg b/vendor/assets/fonts/rails_admin/fontawesome-webfont.svg
diff --git a/vendor/assets/fonts/rails_admin/fontawesome-webfont.ttf b/vendor/assets/fonts/rails_admin/fontawesome-webfont.ttf
diff --git a/vendor/assets/fonts/rails_admin/fontawesome-webfont.woff b/vendor/assets/fonts/rails_admin/fontawesome-webfont.woff
diff --git a/vendor/assets/fonts/rails_admin/fontawesome-webfont.woff2 b/vendor/assets/fonts/rails_admin/fontawesome-webfont.woff2