Skip to content

Commit

Permalink
Merge pull request #12 from RadiusNetworks/font-awesome
Browse files Browse the repository at this point in the history
Upgrade Font Awesome to v4.7
  • Loading branch information
csexton authored Oct 24, 2017
2 parents e1545d0 + ebaadf4 commit 12e2c3d
Show file tree
Hide file tree
Showing 7 changed files with 2,814 additions and 689 deletions.
Binary file modified app/assets/fonts/FontAwesome.otf
100644 → 100755
Binary file not shown.
Binary file modified app/assets/fonts/fontawesome-webfont.eot
100644 → 100755
Binary file not shown.
3,350 changes: 2,668 additions & 682 deletions app/assets/fonts/fontawesome-webfont.svg
100644 → 100755
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
100644 → 100755
Binary file not shown.
Binary file modified app/assets/fonts/fontawesome-webfont.woff
100644 → 100755
Binary file not shown.
Binary file modified app/assets/fonts/fontawesome-webfont.woff2
100644 → 100755
Binary file not shown.
153 changes: 146 additions & 7 deletions app/assets/stylesheets/font-awesome.css.erb
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
/*!
* Font Awesome 4.6.3 by @davegandy - http://fontawesome.io - @fontawesome
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
/* FONT PATH
* -------------------------- */
//= depend_on_asset "fontawesome-webfont.eot"
//= depend_on_asset "fontawesome-webfont.woff2"
//= depend_on_asset "fontawesome-webfont.woff"
//= depend_on_asset "fontawesome-webfont.ttf"
//= depend_on_asset "fontawesome-webfont.svg"
@font-face {
font-family: 'FontAwesome';
src: url('<%= asset_path 'fontawesome-webfont.eot' %>?v=4.4.0');
src: url('<%= asset_path 'fontawesome-webfont.eot' %>?#iefix&v=4.4.0') format('embedded-opentype'),
url('<%= asset_path 'fontawesome-webfont.woff2' %>?v=4.4.0') format('woff2'),
url('<%= asset_path 'fontawesome-webfont.woff' %>?v=4.4.0') format('woff'),
url('<%= asset_path 'fontawesome-webfont.ttf' %>?v=4.4.0') format('truetype'),
url('<%= asset_path 'fontawesome-webfont.svg' %>?v=4.4.0#fontawesomeregular') format('svg');
src: url('<%= font_path('fontawesome-webfont.eot') %>');
src: url('<%= font_path('fontawesome-webfont.eot') %>?#iefix') format('embedded-opentype'), url('<%= font_path('fontawesome-webfont.woff2') %>') format('woff2'), url('<%= font_path('fontawesome-webfont.woff') %>') format('woff'), url('<%= font_path('fontawesome-webfont.ttf') %>') format('truetype'), url('<%= font_path('fontawesome-webfont.svg') %>#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -1836,6 +1837,7 @@
content: "\f23e";
}
.fa-battery-4:before,
.fa-battery:before,
.fa-battery-full:before {
content: "\f240";
}
Expand Down Expand Up @@ -2182,6 +2184,143 @@
.fa-font-awesome:before {
content: "\f2b4";
}
.fa-handshake-o:before {
content: "\f2b5";
}
.fa-envelope-open:before {
content: "\f2b6";
}
.fa-envelope-open-o:before {
content: "\f2b7";
}
.fa-linode:before {
content: "\f2b8";
}
.fa-address-book:before {
content: "\f2b9";
}
.fa-address-book-o:before {
content: "\f2ba";
}
.fa-vcard:before,
.fa-address-card:before {
content: "\f2bb";
}
.fa-vcard-o:before,
.fa-address-card-o:before {
content: "\f2bc";
}
.fa-user-circle:before {
content: "\f2bd";
}
.fa-user-circle-o:before {
content: "\f2be";
}
.fa-user-o:before {
content: "\f2c0";
}
.fa-id-badge:before {
content: "\f2c1";
}
.fa-drivers-license:before,
.fa-id-card:before {
content: "\f2c2";
}
.fa-drivers-license-o:before,
.fa-id-card-o:before {
content: "\f2c3";
}
.fa-quora:before {
content: "\f2c4";
}
.fa-free-code-camp:before {
content: "\f2c5";
}
.fa-telegram:before {
content: "\f2c6";
}
.fa-thermometer-4:before,
.fa-thermometer:before,
.fa-thermometer-full:before {
content: "\f2c7";
}
.fa-thermometer-3:before,
.fa-thermometer-three-quarters:before {
content: "\f2c8";
}
.fa-thermometer-2:before,
.fa-thermometer-half:before {
content: "\f2c9";
}
.fa-thermometer-1:before,
.fa-thermometer-quarter:before {
content: "\f2ca";
}
.fa-thermometer-0:before,
.fa-thermometer-empty:before {
content: "\f2cb";
}
.fa-shower:before {
content: "\f2cc";
}
.fa-bathtub:before,
.fa-s15:before,
.fa-bath:before {
content: "\f2cd";
}
.fa-podcast:before {
content: "\f2ce";
}
.fa-window-maximize:before {
content: "\f2d0";
}
.fa-window-minimize:before {
content: "\f2d1";
}
.fa-window-restore:before {
content: "\f2d2";
}
.fa-times-rectangle:before,
.fa-window-close:before {
content: "\f2d3";
}
.fa-times-rectangle-o:before,
.fa-window-close-o:before {
content: "\f2d4";
}
.fa-bandcamp:before {
content: "\f2d5";
}
.fa-grav:before {
content: "\f2d6";
}
.fa-etsy:before {
content: "\f2d7";
}
.fa-imdb:before {
content: "\f2d8";
}
.fa-ravelry:before {
content: "\f2d9";
}
.fa-eercast:before {
content: "\f2da";
}
.fa-microchip:before {
content: "\f2db";
}
.fa-snowflake-o:before {
content: "\f2dc";
}
.fa-superpowers:before {
content: "\f2dd";
}
.fa-wpexplorer:before {
content: "\f2de";
}
.fa-meetup:before {
content: "\f2e0";
}
.sr-only {
position: absolute;
width: 1px;
Expand Down

0 comments on commit 12e2c3d

Please sign in to comment.