Include fonts in load path. Use asset-url helpers

Include fonts in sass load path. Rename font-awesomes.css.erb to font-awesome.scss. Use asset-url helpers.
cselmer · Oct 12, 2019 · 3fe3783 · 3fe3783
1 parent be8a0f0
commit 3fe3783
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/rails_admin/bootstrap-sass.rb b/lib/rails_admin/bootstrap-sass.rb
@@ -19,7 +19,9 @@ def self.load!
 
       if defined?(::Sass) && ::Sass.respond_to?(:load_paths)
         stylesheets = File.expand_path(File.join('..', 'vendor', 'assets', 'stylesheets'))
+        fonts = File.expand_path(File.join('..', 'vendor', 'assets', 'fonts'))
         ::Sass.load_paths << stylesheets
+        ::Sass.load_paths << fonts
       end
     end
 

diff --git a/...lesheets/rails_admin/font-awesome.css.erb → ...stylesheets/rails_admin/font-awesome.scss b/...lesheets/rails_admin/font-awesome.css.erb → ...stylesheets/rails_admin/font-awesome.scss
@@ -11,8 +11,8 @@
 //= depend_on_asset "rails_admin/fontawesome-webfont.svg"
 @font-face {
   font-family: 'FontAwesome';
-  src: url('<%= font_path('rails_admin/fontawesome-webfont.eot') %>');
-  src: url('<%= font_path('rails_admin/fontawesome-webfont.eot') %>?#iefix') format('embedded-opentype'), url('<%= font_path('rails_admin/fontawesome-webfont.woff2') %>') format('woff2'), url('<%= font_path('rails_admin/fontawesome-webfont.woff') %>') format('woff'), url('<%= font_path('rails_admin/fontawesome-webfont.ttf') %>') format('truetype'), url('<%= font_path('rails_admin/fontawesome-webfont.svg') %>#fontawesomeregular') format('svg');
+  src: asset-url('rails_admin/fontawesome-webfont.eot');
+  src: asset-url('rails_admin/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), asset-url('rails_admin/fontawesome-webfont.woff2') format('woff2'), asset-url('rails_admin/fontawesome-webfont.woff') format('woff'), asset-url('rails_admin/fontawesome-webfont.ttf') format('truetype'), asset-url('rails_admin/fontawesome-webfont.svg#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }