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

4.7.0 Minor Release #10012

Merged
merged 44 commits into from Oct 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
dc05abb
Initial commit to get version sorted
davegandy Oct 3, 2016
f3de428
Referencing PR in 4.7.0 README
davegandy Oct 3, 2016
ea44fd3
Updating font file details to 4.7.0
davegandy Oct 3, 2016
3358e34
Adding handshake-o icon #878.
davegandy Oct 3, 2016
12dcb10
Adding envelope-open #897
davegandy Oct 4, 2016
4362234
Another update to envelope-open
davegandy Oct 4, 2016
8f8877c
Adding temp linode, updating envelope-open
davegandy Oct 4, 2016
5b1bf91
Updating Mastercard CC logo #9633
davegandy Oct 4, 2016
aff1205
Adding address-book, address-book-o, address-card, address-card-o #825
davegandy Oct 4, 2016
c0b4f9c
Adding user-o, user-circle, and user-circle-o
davegandy Oct 5, 2016
7cf56ab
Most user icons updated to new spec
davegandy Oct 5, 2016
9192715
Adding id-badge, id-card, and id-card-o #825
davegandy Oct 5, 2016
60e16b5
Adding quora #510
davegandy Oct 5, 2016
2d07b44
Adding Free Code Camp icon #6927
davegandy Oct 5, 2016
567cdad
Adding Telegram #3034
davegandy Oct 5, 2016
571a58a
Updating youtube play icon to match official youtube social logo #10021
davegandy Oct 5, 2016
ec19cbb
Updating youtube-play icon
davegandy Oct 6, 2016
1a64ae9
Added 5 thermometer states #720
davegandy Oct 6, 2016
53edeba
Adding bath and shower #708
davegandy Oct 6, 2016
ff13aba
Using ad proxy
supercodepoet Oct 10, 2016
f657b32
Localize monetization.js file
supercodepoet Oct 10, 2016
5259fd4
Adding podcast #2125
davegandy Oct 11, 2016
546bef0
Adding a critical alias
davegandy Oct 11, 2016
b9ee94f
updating codie-pie logo #5804
davegandy Oct 11, 2016
ccd5616
Merge remote-tracking branch 'origin/ad-proxy' into 4.7.0
davegandy Oct 11, 2016
101b256
Updating BSA
davegandy Oct 11, 2016
8f5d267
Styling new BSA
davegandy Oct 11, 2016
659554c
Adding windows minimize, maximize, restore, and close #1582
davegandy Oct 11, 2016
29b0efd
Adding bandcamp #1725
davegandy Oct 11, 2016
8493d4e
Fixing unicode
davegandy Oct 11, 2016
60492fb
Adding grav #8503
davegandy Oct 11, 2016
7bc5c3c
Added Etsy, IMDb, and Ravelry #1962 #998 #3314
davegandy Oct 11, 2016
9ea7150
Adding eercast logo
davegandy Oct 12, 2016
2c6f919
Adjusting banner mix
davegandy Oct 12, 2016
a09ba0d
Prepping Kickstarter modal and navbar
davegandy Oct 22, 2016
28565b6
Adding microchip #1840
davegandy Oct 22, 2016
5e95eb0
Flipping spock icon #10082
davegandy Oct 22, 2016
c6f76a6
Adding snowflake-o #1739
davegandy Oct 22, 2016
3f5146a
Adding meetup #1588
davegandy Oct 22, 2016
5b90d7c
Updating brand license information.
davegandy Oct 22, 2016
e26f4bc
Updating navbar
davegandy Oct 24, 2016
1645c76
Updating icon files, path, and navbar icon
davegandy Oct 24, 2016
12c3110
Updating icon carousel with latest icons
davegandy Oct 24, 2016
9fe5852
Merge branch 'master' into 4.7.0
davegandy Oct 24, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -4,4 +4,5 @@ gem 'jekyll', '~> 1.0'
gem 'safe_yaml', '~> 1.0.4'
gem 'sass', '~> 3.0'
gem 'less', '~> 2.5.0'
gem 'libv8', '~> 3.16.14.0'
gem 'therubyracer'
6 changes: 5 additions & 1 deletion Gemfile.lock
Expand Up @@ -24,7 +24,7 @@ GEM
toml (~> 0.1.0)
less (2.5.1)
commonjs (~> 0.2.7)
libv8 (3.16.14.13)
libv8 (3.16.14.15)
liquid (2.5.5)
listen (1.3.1)
rb-fsevent (>= 0.9.3)
Expand Down Expand Up @@ -59,6 +59,10 @@ PLATFORMS
DEPENDENCIES
jekyll (~> 1.0)
less (~> 2.5.0)
libv8 (~> 3.16.14.0)
safe_yaml (~> 1.0.4)
sass (~> 3.0)
therubyracer

BUNDLED WITH
1.13.2
4 changes: 2 additions & 2 deletions README.md
@@ -1,7 +1,7 @@
# [Font Awesome v4.6.3](http://fontawesome.io)
# [Font Awesome v4.7.0](http://fontawesome.io)
### The iconic font and CSS framework

Font Awesome is a full suite of 634 pictographic icons for easy scalable vector graphics on websites,
Font Awesome is a full suite of 675 pictographic icons for easy scalable vector graphics on websites,
created and maintained by [Dave Gandy](https://twitter.com/davegandy).
Stay up to date with the latest release and announcements on Twitter:
[@fontawesome](http://twitter.com/fontawesome).
Expand Down
6 changes: 3 additions & 3 deletions _config.yml
Expand Up @@ -19,10 +19,10 @@ icon_layout: icon.html # Relative to _layouts directory
icon_destination: icon # Relative to destination

fontawesome:
version: 4.6.3
minor_version: 4.6
version: 4.7.0
minor_version: 4.7
major_version: 4
doc_blob: v4.6.3
doc_blob: v4.7.0
url: http://fontawesome.io
legacy_url: http://fortawesome.github.com/Font-Awesome/
blog_url: http://articles.fortawesome.com
Expand Down
2 changes: 1 addition & 1 deletion component.json
Expand Up @@ -2,7 +2,7 @@
"name": "font-awesome",
"repo": "FortAwesome/Font-Awesome",
"description": "Font Awesome",
"version": "4.6.3",
"version": "4.7.0",
"keywords": [],
"dependencies": {},
"development": {},
Expand Down
144 changes: 141 additions & 3 deletions css/font-awesome.css
@@ -1,13 +1,13 @@
/*!
* 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
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.6.3');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.6.3') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.6.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.6.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.6.3#fontawesomeregular') format('svg');
src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -1832,6 +1832,7 @@
content: "\f23e";
}
.fa-battery-4:before,
.fa-battery:before,
.fa-battery-full:before {
content: "\f240";
}
Expand Down Expand Up @@ -2178,6 +2179,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
4 changes: 2 additions & 2 deletions css/font-awesome.min.css

Large diffs are not rendered by default.

Binary file modified fonts/FontAwesome.otf
Binary file not shown.
Binary file modified fonts/fontawesome-webfont.eot
Binary file not shown.