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.

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

Please update to 4.6.2 #170

Merged
merged 2 commits into from
May 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified app/assets/fonts/FontAwesome.otf
Binary file not shown.
Binary file modified app/assets/fonts/fontawesome-webfont.eot
Binary file not shown.
140 changes: 70 additions & 70 deletions app/assets/fonts/fontawesome-webfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file modified app/assets/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file modified app/assets/fonts/fontawesome-webfont.woff2
Binary file not shown.
17 changes: 15 additions & 2 deletions app/assets/stylesheets/font-awesome.css.erb
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -1515,6 +1515,7 @@
content: "\f1ce";
}
.fa-ra:before,
.fa-resistance:before,
.fa-rebel:before {
content: "\f1d0";
}
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions lib/font-awesome-rails/version.rb
Original file line number Diff line number Diff line change
@@ -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