diff --git a/assets/stylesheets/font-awesome/_path.scss b/assets/stylesheets/font-awesome/_path.scss index 0f2d5574..dd2a4d91 100644 --- a/assets/stylesheets/font-awesome/_path.scss +++ b/assets/stylesheets/font-awesome/_path.scss @@ -5,36 +5,36 @@ font-family: 'Font Awesome 5 Free'; font-style: normal; font-weight: 900; - src: url('#{$fa-font-path}/fa-solid-900.eot'); - src: url('#{$fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'), - url('#{$fa-font-path}/fa-solid-900.woff2') format('woff2'), - url('#{$fa-font-path}/fa-solid-900.woff') format('woff'), - url('#{$fa-font-path}/fa-solid-900.ttf') format('truetype'), - url('#{$fa-font-path}/fa-solid-900.svg#fontawesome') format('svg'); + src: url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-solid-900.eot'), '#{$fa-font-path}/fa-solid-900.eot')); + src: url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-solid-900.eot#iefix'), '#{$fa-font-path}/fa-solid-900.eot#iefix')) format('embedded-opentype'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-solid-900.woff2'), '#{$fa-font-path}/fa-solid-900.woff2')) format('woff2'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-solid-900.woff'), '#{$fa-font-path}/fa-solid-900.woff')) format('woff'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-solid-900.ttf'), '#{$fa-font-path}/fa-solid-900.ttf')) format('truetype'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-solid-900.svg#fontawesome'), '#{$fa-font-path}/fa-solid-900.svg#fontawesome')) format('svg'); } @font-face { font-family: 'Font Awesome 5 Free'; font-style: normal; font-weight: 400; - src: url('#{$fa-font-path}/fa-regular-400.eot'); - src: url('#{$fa-font-path}/fa-regular-400.eot?#iefix') format('embedded-opentype'), - url('#{$fa-font-path}/fa-regular-400.woff2') format('woff2'), - url('#{$fa-font-path}/fa-regular-400.woff') format('woff'), - url('#{$fa-font-path}/fa-regular-400.ttf') format('truetype'), - url('#{$fa-font-path}/fa-regular-400.svg#fontawesome') format('svg'); + src: url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-regular-400.eot'), '#{$fa-font-path}/fa-regular-400.eot')); + src: url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-regular-400.eot#iefix'), '#{$fa-font-path}/fa-regular-400.eot#iefix')) format('embedded-opentype'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-regular-400.woff2'), '#{$fa-font-path}/fa-regular-400.woff2')) format('woff2'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-regular-400.woff'), '#{$fa-font-path}/fa-regular-400.woff')) format('woff'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-regular-400.ttf'), '#{$fa-font-path}/fa-regular-400.ttf')) format('truetype'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-regular-400.svg#fontawesome'), '#{$fa-font-path}/fa-regular-400.svg#fontawesome')) format('svg'); } @font-face { font-family: 'Font Awesome 5 Brands'; font-style: normal; font-weight: normal; - src: url('#{$fa-font-path}/fa-brands-400.eot'); - src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'), - url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'), - url('#{$fa-font-path}/fa-brands-400.woff') format('woff'), - url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'), - url('#{$fa-font-path}/fa-brands-400.svg#fontawesome') format('svg'); + src: url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-brands-400.eot'), '#{$fa-font-path}/fa-brands-400.eot')); + src: url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-brands-400.eot#iefix'), '#{$fa-font-path}/fa-brands-400.eot#iefix')) format('embedded-opentype'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-brands-400.woff2'), '#{$fa-font-path}/fa-brands-400.woff2')) format('woff2'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-brands-400.woff'), '#{$fa-font-path}/fa-brands-400.woff')) format('woff'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-brands-400.ttf'), '#{$fa-font-path}/fa-brands-400.ttf')) format('truetype'), + url(if($fa-sass-asset-helper, fa-font-path('#{$fa-font-path}/fa-brands-400.svg#fontawesome'), '#{$fa-font-path}/fa-brands-400.svg#fontawesome')) format('svg'); } .fa, diff --git a/assets/stylesheets/font-awesome/_variables.scss b/assets/stylesheets/font-awesome/_variables.scss index 35e32c84..bf42fdbd 100644 --- a/assets/stylesheets/font-awesome/_variables.scss +++ b/assets/stylesheets/font-awesome/_variables.scss @@ -4,6 +4,7 @@ $fa-sass-asset-helper: false !default; $fa-font-path: if($fa-sass-asset-helper, "font-awesome", "../fonts/font-awesome") !default; + $fa-font-size-base: 16px !default; $fa-css-prefix: fa !default; $fa-version: "5.0.6" !default; diff --git a/lib/font_awesome/sass/rails/engine.rb b/lib/font_awesome/sass/rails/engine.rb index b76f822a..c7dfbff1 100644 --- a/lib/font_awesome/sass/rails/engine.rb +++ b/lib/font_awesome/sass/rails/engine.rb @@ -10,7 +10,7 @@ class Engine < ::Rails::Engine %w[eot svg ttf woff woff2].each do |ext| app.config.assets.precompile << "font-awesome/fa-brands-400.#{ext}" app.config.assets.precompile << "font-awesome/fa-regular-400.#{ext}" - app.config.assets.precompile << "font-awesome/fa-solid-400.#{ext}" + app.config.assets.precompile << "font-awesome/fa-solid-900.#{ext}" end end end diff --git a/lib/font_awesome/sass/version.rb b/lib/font_awesome/sass/version.rb index e01bd443..dd0fdab4 100644 --- a/lib/font_awesome/sass/version.rb +++ b/lib/font_awesome/sass/version.rb @@ -1,5 +1,5 @@ module FontAwesome module Sass - VERSION = '5.0.6.1'.freeze + VERSION = '5.0.6.2'.freeze end end