From 3fe37830fa2421455d00dfde3f2110c18ea7cc83 Mon Sep 17 00:00:00 2001 From: Chris Selmer Date: Fri, 11 Oct 2019 23:53:48 -0700 Subject: [PATCH] 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. --- lib/rails_admin/bootstrap-sass.rb | 2 ++ .../rails_admin/{font-awesome.css.erb => font-awesome.scss} | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) rename vendor/assets/stylesheets/rails_admin/{font-awesome.css.erb => font-awesome.scss} (98%) diff --git a/lib/rails_admin/bootstrap-sass.rb b/lib/rails_admin/bootstrap-sass.rb index 0897500b49..82fd00730d 100755 --- 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/vendor/assets/stylesheets/rails_admin/font-awesome.css.erb b/vendor/assets/stylesheets/rails_admin/font-awesome.scss similarity index 98% rename from vendor/assets/stylesheets/rails_admin/font-awesome.css.erb rename to vendor/assets/stylesheets/rails_admin/font-awesome.scss index 627c6b08f5..f72dac9d9d 100644 --- a/vendor/assets/stylesheets/rails_admin/font-awesome.css.erb +++ b/vendor/assets/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; }