diff --git a/CHANGELOG.md b/CHANGELOG.md index 59c7862..230bafc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,8 @@ See [GitHub Releases](https://github.com/bokmann/font-awesome-rails/releases) | 4.5.0.0 | dbc8d1b | 4.5.0 release (new icons) | | 4.5.0.1 | dbc8d1b | added official Rails 5 support | | 4.6.0.0 | 5697be9 | 4.6.0 release (new icons) | - | 4.6.1.0 | 6535013 | 4.6.1 release (minor stylesheet fixes) | + | 4.6.1.0 | 6535013 | [4.6.1 release](https://github.com/FortAwesome/Font-Awesome/pull/8962) (minor stylesheet fixes) | + | 4.6.2.0 | e7cc59d | [4.6.2 release](https://github.com/FortAwesome/Font-Awesome/pull/9117) (fixes and new icons) | **note on version 0.2.0**: FontAwesome now includes scss and sass files, but when I used them instead of the plain ol css file included in the project, it diff --git a/app/assets/fonts/FontAwesome.otf b/app/assets/fonts/FontAwesome.otf index 59853bc..5e1fc3a 100755 Binary files a/app/assets/fonts/FontAwesome.otf and b/app/assets/fonts/FontAwesome.otf differ diff --git a/app/assets/fonts/fontawesome-webfont.eot b/app/assets/fonts/fontawesome-webfont.eot index 96f92f9..4faa486 100755 Binary files a/app/assets/fonts/fontawesome-webfont.eot and b/app/assets/fonts/fontawesome-webfont.eot differ diff --git a/app/assets/fonts/fontawesome-webfont.svg b/app/assets/fonts/fontawesome-webfont.svg index 5a5f0ec..d32830c 100755 --- a/app/assets/fonts/fontawesome-webfont.svg +++ b/app/assets/fonts/fontawesome-webfont.svg @@ -59,17 +59,17 @@ - + - + - - + + @@ -78,9 +78,9 @@ - - - + + + @@ -100,15 +100,15 @@ - - - + + + - - - + + + @@ -134,10 +134,10 @@ - + - + @@ -146,7 +146,7 @@ - + @@ -157,10 +157,10 @@ - + - + @@ -171,11 +171,11 @@ - - + + - + @@ -187,14 +187,14 @@ - + - + @@ -211,8 +211,8 @@ - - + + @@ -256,7 +256,7 @@ - + @@ -296,13 +296,13 @@ - - + + - - + + @@ -318,12 +318,12 @@ - + - + @@ -333,7 +333,7 @@ - + @@ -356,8 +356,8 @@ - - + + @@ -374,11 +374,11 @@ - + - - + + @@ -389,27 +389,27 @@ - + - + - + - + - + @@ -421,14 +421,14 @@ - + - + - + @@ -441,8 +441,8 @@ - - + + @@ -452,7 +452,7 @@ - + @@ -476,17 +476,17 @@ - - + + - + - + - + @@ -498,7 +498,7 @@ - + @@ -509,19 +509,19 @@ - + - + - + @@ -536,7 +536,7 @@ - + @@ -557,7 +557,7 @@ - + @@ -589,7 +589,7 @@ - + @@ -604,14 +604,14 @@ - + - + @@ -648,7 +648,7 @@ - + @@ -657,17 +657,17 @@ - + - + - - - - + + + + diff --git a/app/assets/fonts/fontawesome-webfont.ttf b/app/assets/fonts/fontawesome-webfont.ttf index 86784df..9d02852 100755 Binary files a/app/assets/fonts/fontawesome-webfont.ttf and b/app/assets/fonts/fontawesome-webfont.ttf differ diff --git a/app/assets/fonts/fontawesome-webfont.woff b/app/assets/fonts/fontawesome-webfont.woff index c7faa19..1b92d42 100755 Binary files a/app/assets/fonts/fontawesome-webfont.woff and b/app/assets/fonts/fontawesome-webfont.woff differ diff --git a/app/assets/fonts/fontawesome-webfont.woff2 b/app/assets/fonts/fontawesome-webfont.woff2 index cab8571..88095c7 100755 Binary files a/app/assets/fonts/fontawesome-webfont.woff2 and b/app/assets/fonts/fontawesome-webfont.woff2 differ diff --git a/app/assets/stylesheets/font-awesome.css.erb b/app/assets/stylesheets/font-awesome.css.erb index 2c38d7f..a6e6133 100644 --- a/app/assets/stylesheets/font-awesome.css.erb +++ b/app/assets/stylesheets/font-awesome.css.erb @@ -1,5 +1,5 @@ /*! - * Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.6.2 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ /* FONT PATH @@ -1389,7 +1389,7 @@ .fa-digg:before { content: "\f1a6"; } -.fa-pied-piper:before { +.fa-pied-piper-pp:before { content: "\f1a7"; } .fa-pied-piper-alt:before { @@ -1515,6 +1515,7 @@ content: "\f1ce"; } .fa-ra:before, +.fa-resistance:before, .fa-rebel:before { content: "\f1d0"; } @@ -2163,6 +2164,18 @@ .fa-snapchat-square:before { content: "\f2ad"; } +.fa-pied-piper:before { + content: "\f2ae"; +} +.fa-first-order:before { + content: "\f2b0"; +} +.fa-yoast:before { + content: "\f2b1"; +} +.fa-themeisle:before { + content: "\f2b2"; +} .sr-only { position: absolute; width: 1px; diff --git a/lib/font-awesome-rails/version.rb b/lib/font-awesome-rails/version.rb index 5ec9f09..c8c8ce0 100644 --- a/lib/font-awesome-rails/version.rb +++ b/lib/font-awesome-rails/version.rb @@ -1,6 +1,6 @@ module FontAwesome module Rails - FA_VERSION = "4.6.1" - VERSION = "4.6.1.0" + FA_VERSION = "4.6.2" + VERSION = "4.6.2.0" end end