Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Font Awesome Free 5.12.0 #190

Merged
merged 2 commits into from
Dec 15, 2019
Merged

Font Awesome Free 5.12.0 #190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a19857
Updating to 5.12.0
supercodepoet Dec 15, 2019
8b8f697
Adding font-display use and lazy load ViewHelpers
supercodepoet Dec 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Adding font-display use and lazy load ViewHelpers
  • Loading branch information
@supercodepoet
supercodepoet committed Dec 15, 2019
commit 8b8f697ed876a9b04dd51b888f9fb4cd6eedae25
3 changes: 3 additions & 0 deletions assets/stylesheets/font-awesome/_path.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-display: $fa-font-display;
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'),
Expand All @@ -17,6 +18,7 @@
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-display: $fa-font-display;
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'),
Expand All @@ -29,6 +31,7 @@
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
font-display: $fa-font-display;
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'),
Expand Down
4 changes: 3 additions & 1 deletion lib/font_awesome/sass/rails/railtie.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ module Sass
module Rails
class Railtie < ::Rails::Railtie
initializer 'font-awesome-sass.view_helpers' do
ActionView::Base.send :include, ViewHelpers
ActiveSupport.on_load(:action_view) do
include ViewHelpers
end
end
end
end
Expand Down