Skip to content

Commit

Permalink
Upgraded to FontAwesome 4.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
rmm5t committed May 15, 2016
1 parent c46679b commit 91c871f
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 73 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ See [GitHub Releases](https://github.com/bokmann/font-awesome-rails/releases)

| Version | FontAwesome SHA1 | Notes / Other additions |
|---------|------------------|--------------------------------------------------------------------|
| 4.6.3.0 | `8e241f2` | [4.6.3 release](https://github.com/FortAwesome/Font-Awesome/pull/9189) (new brand icons) |
| 4.6.2.0 | `e7cc59d` | [4.6.2 release](https://github.com/FortAwesome/Font-Awesome/pull/9117) (fixes and new icons) |
| 4.6.1.0 | `6535013` | [4.6.1 release](https://github.com/FortAwesome/Font-Awesome/pull/8962) (minor stylesheet fixes) |
| 4.6.0.0 | `5697be9` | 4.6.0 release (new icons) |
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.
10 changes: 9 additions & 1 deletion 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.2 by @davegandy - http://fontawesome.io - @fontawesome
* Font Awesome 4.6.3 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 @@ -2176,6 +2176,14 @@
.fa-themeisle:before {
content: "\f2b2";
}
.fa-google-plus-circle:before,
.fa-google-plus-official:before {
content: "\f2b3";
}
.fa-fa:before,
.fa-font-awesome:before {
content: "\f2b4";
}
.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.2"
VERSION = "4.6.2.0"
FA_VERSION = "4.6.3"
VERSION = "4.6.3.0"
end
end

0 comments on commit 91c871f

Please sign in to comment.