Explorar el Código

Merge branch '4.5.0-wip'

Travis Chase hace 9 años
padre
commit
dbc8d1b9b6

+ 0 - 3
Gemfile.lock

@@ -62,6 +62,3 @@ DEPENDENCIES
   safe_yaml (~> 1.0.4)
   sass (~> 3.0)
   therubyracer
-
-BUNDLED WITH
-   1.10.6

+ 3 - 2
README.md

@@ -1,7 +1,7 @@
-#[Font Awesome v4.4.0](http://fontawesome.io)
+#[Font Awesome v4.5.0](http://fontawesome.io)
 ###The iconic font and CSS framework
 
-Font Awesome is a full suite of 585 pictographic icons for easy scalable vector graphics on websites,
+Font Awesome is a full suite of 605 pictographic icons for easy scalable vector graphics on websites,
 created and maintained by [Dave Gandy](http://twitter.com/davegandy).
 Stay up to date with the latest release and announcements on Twitter:
 [@fontawesome](http://twitter.com/fontawesome).
@@ -20,6 +20,7 @@ Get started at http://fontawesome.io!
 - Full details: http://fontawesome.io/license
 
 ##Changelog
+- [v4.5.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.5.0+is%3Aclosed)
 - [v4.4.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.4.0+is%3Aclosed)
 - [v4.3.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.3.0+is%3Aclosed)
 - [v4.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=12&page=1&state=closed)

+ 3 - 3
_config.yml

@@ -19,10 +19,10 @@ icon_layout:      icon.html    # Relative to _layouts directory
 icon_destination: icon         # Relative to destination
 
 fontawesome:
-  version:        4.4.0
-  minor_version:  4.4
+  version:        4.5.0
+  minor_version:  4.5
   major_version:  4
-  doc_blob:       v4.4.0
+  doc_blob:       v4.5.0
   url:            http://fontawesome.io
   legacy_url:     http://fortawesome.github.com/Font-Awesome/
   blog_url:       http://blog.fontawesome.io

+ 63 - 3
css/font-awesome.css

@@ -1,13 +1,13 @@
 /*!
- *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.5.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.4.0');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.5.0');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -2024,3 +2024,63 @@
 .fa-fonticons:before {
   content: "\f280";
 }
+.fa-reddit-alien:before {
+  content: "\f281";
+}
+.fa-edge:before {
+  content: "\f282";
+}
+.fa-credit-card-alt:before {
+  content: "\f283";
+}
+.fa-codiepie:before {
+  content: "\f284";
+}
+.fa-modx:before {
+  content: "\f285";
+}
+.fa-fort-awesome:before {
+  content: "\f286";
+}
+.fa-usb:before {
+  content: "\f287";
+}
+.fa-product-hunt:before {
+  content: "\f288";
+}
+.fa-mixcloud:before {
+  content: "\f289";
+}
+.fa-scribd:before {
+  content: "\f28a";
+}
+.fa-pause-circle:before {
+  content: "\f28b";
+}
+.fa-pause-circle-o:before {
+  content: "\f28c";
+}
+.fa-stop-circle:before {
+  content: "\f28d";
+}
+.fa-stop-circle-o:before {
+  content: "\f28e";
+}
+.fa-shopping-bag:before {
+  content: "\f290";
+}
+.fa-shopping-basket:before {
+  content: "\f291";
+}
+.fa-hashtag:before {
+  content: "\f292";
+}
+.fa-bluetooth:before {
+  content: "\f293";
+}
+.fa-bluetooth-b:before {
+  content: "\f294";
+}
+.fa-percent:before {
+  content: "\f295";
+}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
css/font-awesome.min.css


BIN
fonts/FontAwesome.otf


BIN
fonts/fontawesome-webfont.eot


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 7 - 7
fonts/fontawesome-webfont.svg


BIN
fonts/fontawesome-webfont.ttf


BIN
fonts/fontawesome-webfont.woff


BIN
fonts/fontawesome-webfont.woff2


+ 1 - 1
less/font-awesome.less

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 

+ 20 - 0
less/icons.less

@@ -675,3 +675,23 @@
 .@{fa-css-prefix}-vimeo:before { content: @fa-var-vimeo; }
 .@{fa-css-prefix}-black-tie:before { content: @fa-var-black-tie; }
 .@{fa-css-prefix}-fonticons:before { content: @fa-var-fonticons; }
+.@{fa-css-prefix}-reddit-alien:before { content: @fa-var-reddit-alien; }
+.@{fa-css-prefix}-edge:before { content: @fa-var-edge; }
+.@{fa-css-prefix}-credit-card-alt:before { content: @fa-var-credit-card-alt; }
+.@{fa-css-prefix}-codiepie:before { content: @fa-var-codiepie; }
+.@{fa-css-prefix}-modx:before { content: @fa-var-modx; }
+.@{fa-css-prefix}-fort-awesome:before { content: @fa-var-fort-awesome; }
+.@{fa-css-prefix}-usb:before { content: @fa-var-usb; }
+.@{fa-css-prefix}-product-hunt:before { content: @fa-var-product-hunt; }
+.@{fa-css-prefix}-mixcloud:before { content: @fa-var-mixcloud; }
+.@{fa-css-prefix}-scribd:before { content: @fa-var-scribd; }
+.@{fa-css-prefix}-pause-circle:before { content: @fa-var-pause-circle; }
+.@{fa-css-prefix}-pause-circle-o:before { content: @fa-var-pause-circle-o; }
+.@{fa-css-prefix}-stop-circle:before { content: @fa-var-stop-circle; }
+.@{fa-css-prefix}-stop-circle-o:before { content: @fa-var-stop-circle-o; }
+.@{fa-css-prefix}-shopping-bag:before { content: @fa-var-shopping-bag; }
+.@{fa-css-prefix}-shopping-basket:before { content: @fa-var-shopping-basket; }
+.@{fa-css-prefix}-hashtag:before { content: @fa-var-hashtag; }
+.@{fa-css-prefix}-bluetooth:before { content: @fa-var-bluetooth; }
+.@{fa-css-prefix}-bluetooth-b:before { content: @fa-var-bluetooth-b; }
+.@{fa-css-prefix}-percent:before { content: @fa-var-percent; }

+ 22 - 2
less/variables.less

@@ -4,9 +4,9 @@
 @fa-font-path:        "../fonts";
 @fa-font-size-base:   14px;
 @fa-line-height-base: 1;
-//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.4.0/fonts"; // for referencing Bootstrap CDN font files directly
+//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.5.0/fonts"; // for referencing Bootstrap CDN font files directly
 @fa-css-prefix:       fa;
-@fa-version:          "4.4.0";
+@fa-version:          "4.5.0";
 @fa-border-color:     #eee;
 @fa-inverse:          #fff;
 @fa-li-width:         (30em / 14);
@@ -86,6 +86,8 @@
 @fa-var-bitbucket-square: "\f172";
 @fa-var-bitcoin: "\f15a";
 @fa-var-black-tie: "\f27e";
+@fa-var-bluetooth: "\f293";
+@fa-var-bluetooth-b: "\f294";
 @fa-var-bold: "\f032";
 @fa-var-bolt: "\f0e7";
 @fa-var-bomb: "\f1e2";
@@ -164,6 +166,7 @@
 @fa-var-code: "\f121";
 @fa-var-code-fork: "\f126";
 @fa-var-codepen: "\f1cb";
+@fa-var-codiepie: "\f284";
 @fa-var-coffee: "\f0f4";
 @fa-var-cog: "\f013";
 @fa-var-cogs: "\f085";
@@ -182,6 +185,7 @@
 @fa-var-copyright: "\f1f9";
 @fa-var-creative-commons: "\f25e";
 @fa-var-credit-card: "\f09d";
+@fa-var-credit-card-alt: "\f283";
 @fa-var-crop: "\f125";
 @fa-var-crosshairs: "\f05b";
 @fa-var-css3: "\f13c";
@@ -204,6 +208,7 @@
 @fa-var-dribbble: "\f17d";
 @fa-var-dropbox: "\f16b";
 @fa-var-drupal: "\f1a9";
+@fa-var-edge: "\f282";
 @fa-var-edit: "\f044";
 @fa-var-eject: "\f052";
 @fa-var-ellipsis-h: "\f141";
@@ -273,6 +278,7 @@
 @fa-var-folder-open-o: "\f115";
 @fa-var-font: "\f031";
 @fa-var-fonticons: "\f280";
+@fa-var-fort-awesome: "\f286";
 @fa-var-forumbee: "\f211";
 @fa-var-forward: "\f04e";
 @fa-var-foursquare: "\f180";
@@ -319,6 +325,7 @@
 @fa-var-hand-scissors-o: "\f257";
 @fa-var-hand-spock-o: "\f259";
 @fa-var-hand-stop-o: "\f256";
+@fa-var-hashtag: "\f292";
 @fa-var-hdd-o: "\f0a0";
 @fa-var-header: "\f1dc";
 @fa-var-headphones: "\f025";
@@ -418,8 +425,10 @@
 @fa-var-minus-circle: "\f056";
 @fa-var-minus-square: "\f146";
 @fa-var-minus-square-o: "\f147";
+@fa-var-mixcloud: "\f289";
 @fa-var-mobile: "\f10b";
 @fa-var-mobile-phone: "\f10b";
+@fa-var-modx: "\f285";
 @fa-var-money: "\f0d6";
 @fa-var-moon-o: "\f186";
 @fa-var-mortar-board: "\f19d";
@@ -446,11 +455,14 @@
 @fa-var-paragraph: "\f1dd";
 @fa-var-paste: "\f0ea";
 @fa-var-pause: "\f04c";
+@fa-var-pause-circle: "\f28b";
+@fa-var-pause-circle-o: "\f28c";
 @fa-var-paw: "\f1b0";
 @fa-var-paypal: "\f1ed";
 @fa-var-pencil: "\f040";
 @fa-var-pencil-square: "\f14b";
 @fa-var-pencil-square-o: "\f044";
+@fa-var-percent: "\f295";
 @fa-var-phone: "\f095";
 @fa-var-phone-square: "\f098";
 @fa-var-photo: "\f03e";
@@ -472,6 +484,7 @@
 @fa-var-plus-square-o: "\f196";
 @fa-var-power-off: "\f011";
 @fa-var-print: "\f02f";
+@fa-var-product-hunt: "\f288";
 @fa-var-puzzle-piece: "\f12e";
 @fa-var-qq: "\f1d6";
 @fa-var-qrcode: "\f029";
@@ -484,6 +497,7 @@
 @fa-var-rebel: "\f1d0";
 @fa-var-recycle: "\f1b8";
 @fa-var-reddit: "\f1a1";
+@fa-var-reddit-alien: "\f281";
 @fa-var-reddit-square: "\f1a2";
 @fa-var-refresh: "\f021";
 @fa-var-registered: "\f25d";
@@ -508,6 +522,7 @@
 @fa-var-safari: "\f267";
 @fa-var-save: "\f0c7";
 @fa-var-scissors: "\f0c4";
+@fa-var-scribd: "\f28a";
 @fa-var-search: "\f002";
 @fa-var-search-minus: "\f010";
 @fa-var-search-plus: "\f00e";
@@ -525,6 +540,8 @@
 @fa-var-shield: "\f132";
 @fa-var-ship: "\f21a";
 @fa-var-shirtsinbulk: "\f214";
+@fa-var-shopping-bag: "\f290";
+@fa-var-shopping-basket: "\f291";
 @fa-var-shopping-cart: "\f07a";
 @fa-var-sign-in: "\f090";
 @fa-var-sign-out: "\f08b";
@@ -572,6 +589,8 @@
 @fa-var-sticky-note: "\f249";
 @fa-var-sticky-note-o: "\f24a";
 @fa-var-stop: "\f04d";
+@fa-var-stop-circle: "\f28d";
+@fa-var-stop-circle-o: "\f28e";
 @fa-var-street-view: "\f21d";
 @fa-var-strikethrough: "\f0cc";
 @fa-var-stumbleupon: "\f1a4";
@@ -642,6 +661,7 @@
 @fa-var-unlock-alt: "\f13e";
 @fa-var-unsorted: "\f0dc";
 @fa-var-upload: "\f093";
+@fa-var-usb: "\f287";
 @fa-var-usd: "\f155";
 @fa-var-user: "\f007";
 @fa-var-user-md: "\f0f0";

+ 20 - 0
scss/_icons.scss

@@ -675,3 +675,23 @@
 .#{$fa-css-prefix}-vimeo:before { content: $fa-var-vimeo; }
 .#{$fa-css-prefix}-black-tie:before { content: $fa-var-black-tie; }
 .#{$fa-css-prefix}-fonticons:before { content: $fa-var-fonticons; }
+.#{$fa-css-prefix}-reddit-alien:before { content: $fa-var-reddit-alien; }
+.#{$fa-css-prefix}-edge:before { content: $fa-var-edge; }
+.#{$fa-css-prefix}-credit-card-alt:before { content: $fa-var-credit-card-alt; }
+.#{$fa-css-prefix}-codiepie:before { content: $fa-var-codiepie; }
+.#{$fa-css-prefix}-modx:before { content: $fa-var-modx; }
+.#{$fa-css-prefix}-fort-awesome:before { content: $fa-var-fort-awesome; }
+.#{$fa-css-prefix}-usb:before { content: $fa-var-usb; }
+.#{$fa-css-prefix}-product-hunt:before { content: $fa-var-product-hunt; }
+.#{$fa-css-prefix}-mixcloud:before { content: $fa-var-mixcloud; }
+.#{$fa-css-prefix}-scribd:before { content: $fa-var-scribd; }
+.#{$fa-css-prefix}-pause-circle:before { content: $fa-var-pause-circle; }
+.#{$fa-css-prefix}-pause-circle-o:before { content: $fa-var-pause-circle-o; }
+.#{$fa-css-prefix}-stop-circle:before { content: $fa-var-stop-circle; }
+.#{$fa-css-prefix}-stop-circle-o:before { content: $fa-var-stop-circle-o; }
+.#{$fa-css-prefix}-shopping-bag:before { content: $fa-var-shopping-bag; }
+.#{$fa-css-prefix}-shopping-basket:before { content: $fa-var-shopping-basket; }
+.#{$fa-css-prefix}-hashtag:before { content: $fa-var-hashtag; }
+.#{$fa-css-prefix}-bluetooth:before { content: $fa-var-bluetooth; }
+.#{$fa-css-prefix}-bluetooth-b:before { content: $fa-var-bluetooth-b; }
+.#{$fa-css-prefix}-percent:before { content: $fa-var-percent; }

+ 22 - 2
scss/_variables.scss

@@ -4,9 +4,9 @@
 $fa-font-path:        "../fonts" !default;
 $fa-font-size-base:   14px !default;
 $fa-line-height-base: 1 !default;
-//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.4.0/fonts" !default; // for referencing Bootstrap CDN font files directly
+//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.5.0/fonts" !default; // for referencing Bootstrap CDN font files directly
 $fa-css-prefix:       fa !default;
-$fa-version:          "4.4.0" !default;
+$fa-version:          "4.5.0" !default;
 $fa-border-color:     #eee !default;
 $fa-inverse:          #fff !default;
 $fa-li-width:         (30em / 14) !default;
@@ -86,6 +86,8 @@ $fa-var-bitbucket: "\f171";
 $fa-var-bitbucket-square: "\f172";
 $fa-var-bitcoin: "\f15a";
 $fa-var-black-tie: "\f27e";
+$fa-var-bluetooth: "\f293";
+$fa-var-bluetooth-b: "\f294";
 $fa-var-bold: "\f032";
 $fa-var-bolt: "\f0e7";
 $fa-var-bomb: "\f1e2";
@@ -164,6 +166,7 @@ $fa-var-cny: "\f157";
 $fa-var-code: "\f121";
 $fa-var-code-fork: "\f126";
 $fa-var-codepen: "\f1cb";
+$fa-var-codiepie: "\f284";
 $fa-var-coffee: "\f0f4";
 $fa-var-cog: "\f013";
 $fa-var-cogs: "\f085";
@@ -182,6 +185,7 @@ $fa-var-copy: "\f0c5";
 $fa-var-copyright: "\f1f9";
 $fa-var-creative-commons: "\f25e";
 $fa-var-credit-card: "\f09d";
+$fa-var-credit-card-alt: "\f283";
 $fa-var-crop: "\f125";
 $fa-var-crosshairs: "\f05b";
 $fa-var-css3: "\f13c";
@@ -204,6 +208,7 @@ $fa-var-download: "\f019";
 $fa-var-dribbble: "\f17d";
 $fa-var-dropbox: "\f16b";
 $fa-var-drupal: "\f1a9";
+$fa-var-edge: "\f282";
 $fa-var-edit: "\f044";
 $fa-var-eject: "\f052";
 $fa-var-ellipsis-h: "\f141";
@@ -273,6 +278,7 @@ $fa-var-folder-open: "\f07c";
 $fa-var-folder-open-o: "\f115";
 $fa-var-font: "\f031";
 $fa-var-fonticons: "\f280";
+$fa-var-fort-awesome: "\f286";
 $fa-var-forumbee: "\f211";
 $fa-var-forward: "\f04e";
 $fa-var-foursquare: "\f180";
@@ -319,6 +325,7 @@ $fa-var-hand-rock-o: "\f255";
 $fa-var-hand-scissors-o: "\f257";
 $fa-var-hand-spock-o: "\f259";
 $fa-var-hand-stop-o: "\f256";
+$fa-var-hashtag: "\f292";
 $fa-var-hdd-o: "\f0a0";
 $fa-var-header: "\f1dc";
 $fa-var-headphones: "\f025";
@@ -418,8 +425,10 @@ $fa-var-minus: "\f068";
 $fa-var-minus-circle: "\f056";
 $fa-var-minus-square: "\f146";
 $fa-var-minus-square-o: "\f147";
+$fa-var-mixcloud: "\f289";
 $fa-var-mobile: "\f10b";
 $fa-var-mobile-phone: "\f10b";
+$fa-var-modx: "\f285";
 $fa-var-money: "\f0d6";
 $fa-var-moon-o: "\f186";
 $fa-var-mortar-board: "\f19d";
@@ -446,11 +455,14 @@ $fa-var-paperclip: "\f0c6";
 $fa-var-paragraph: "\f1dd";
 $fa-var-paste: "\f0ea";
 $fa-var-pause: "\f04c";
+$fa-var-pause-circle: "\f28b";
+$fa-var-pause-circle-o: "\f28c";
 $fa-var-paw: "\f1b0";
 $fa-var-paypal: "\f1ed";
 $fa-var-pencil: "\f040";
 $fa-var-pencil-square: "\f14b";
 $fa-var-pencil-square-o: "\f044";
+$fa-var-percent: "\f295";
 $fa-var-phone: "\f095";
 $fa-var-phone-square: "\f098";
 $fa-var-photo: "\f03e";
@@ -472,6 +484,7 @@ $fa-var-plus-square: "\f0fe";
 $fa-var-plus-square-o: "\f196";
 $fa-var-power-off: "\f011";
 $fa-var-print: "\f02f";
+$fa-var-product-hunt: "\f288";
 $fa-var-puzzle-piece: "\f12e";
 $fa-var-qq: "\f1d6";
 $fa-var-qrcode: "\f029";
@@ -484,6 +497,7 @@ $fa-var-random: "\f074";
 $fa-var-rebel: "\f1d0";
 $fa-var-recycle: "\f1b8";
 $fa-var-reddit: "\f1a1";
+$fa-var-reddit-alien: "\f281";
 $fa-var-reddit-square: "\f1a2";
 $fa-var-refresh: "\f021";
 $fa-var-registered: "\f25d";
@@ -508,6 +522,7 @@ $fa-var-rupee: "\f156";
 $fa-var-safari: "\f267";
 $fa-var-save: "\f0c7";
 $fa-var-scissors: "\f0c4";
+$fa-var-scribd: "\f28a";
 $fa-var-search: "\f002";
 $fa-var-search-minus: "\f010";
 $fa-var-search-plus: "\f00e";
@@ -525,6 +540,8 @@ $fa-var-sheqel: "\f20b";
 $fa-var-shield: "\f132";
 $fa-var-ship: "\f21a";
 $fa-var-shirtsinbulk: "\f214";
+$fa-var-shopping-bag: "\f290";
+$fa-var-shopping-basket: "\f291";
 $fa-var-shopping-cart: "\f07a";
 $fa-var-sign-in: "\f090";
 $fa-var-sign-out: "\f08b";
@@ -572,6 +589,8 @@ $fa-var-stethoscope: "\f0f1";
 $fa-var-sticky-note: "\f249";
 $fa-var-sticky-note-o: "\f24a";
 $fa-var-stop: "\f04d";
+$fa-var-stop-circle: "\f28d";
+$fa-var-stop-circle-o: "\f28e";
 $fa-var-street-view: "\f21d";
 $fa-var-strikethrough: "\f0cc";
 $fa-var-stumbleupon: "\f1a4";
@@ -642,6 +661,7 @@ $fa-var-unlock: "\f09c";
 $fa-var-unlock-alt: "\f13e";
 $fa-var-unsorted: "\f0dc";
 $fa-var-upload: "\f093";
+$fa-var-usb: "\f287";
 $fa-var-usd: "\f155";
 $fa-var-user: "\f007";
 $fa-var-user-md: "\f0f0";

+ 1 - 1
scss/font-awesome.scss

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 

+ 1 - 0
src/README.md-nobuild

@@ -22,6 +22,7 @@ Get started at {{ site.fontawesome.url }}!
 - Full details: http://fontawesome.io/license
 
 ##Changelog
+- [v4.5.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.5.0+is%3Aclosed)
 - [v4.4.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.4.0+is%3Aclosed)
 - [v4.3.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.3.0+is%3Aclosed)
 - [v4.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=12&page=1&state=closed)

+ 1 - 0
src/_includes/brand-license.html

@@ -1,4 +1,5 @@
 <ul class="margin-bottom-none padding-left-lg">
   <li>All brand icons are trademarks of their respective owners.</li>
   <li>The use of these trademarks does not indicate endorsement of the trademark holder by Font Awesome, nor vice versa.</li>
+  <li>Brand icons should only be used to represent the company or product to which they refer.</li>
 </ul>

+ 1 - 1
src/_includes/jumbotron-carousel.html

@@ -25,7 +25,7 @@
           <!-- Carousel items -->
           <div class="carousel-inner">
             <div class="active item"><div><i class="fa fa-flag"></i></div></div>
-            <div class="item"><div><i class="fa fa-hand-spock-o"></i></div></div>
+            <div class="item"><div><i class="fa fa-fort-awesome"></i></div></div>
             <div class="item"><div><i class="fa fa-sticky-note"></i></div></div>
             <div class="item"><div><i class="fa fa-commenting"></i></div></div>
             <div class="item"><div><i class="fa fa-map-signs"></i></div></div>

+ 1 - 1
src/_includes/navbar.html

@@ -40,7 +40,7 @@
           <ul class="dropdown-menu pull-right">
             <li><a href="{{ page.relative_path }}icons/"><i class="fa fa-flag fa-fw"></i>&nbsp; All Icons</a></li>
             <li class="divider"></li>
-            <li><a href="{{ page.relative_path }}icons/#new"><i class="fa fa-diamond fa-fw"></i>&nbsp; New Icons in {{ site.fontawesome.minor_version }}</a></li>
+            <li><a href="{{ page.relative_path }}icons/#new"><i class="fa fa-fort-awesome fa-fw"></i>&nbsp; New Icons in {{ site.fontawesome.minor_version }}</a></li>
             <li><a href="{{ page.relative_path }}icons/#web-application"><i class="fa fa-camera-retro fa-fw"></i>&nbsp; Web Application Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#hand"><i class="fa fa-hand-spock-o fa-fw"></i>&nbsp; Hand Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#transportation"><i class="fa fa-ship fa-fw"></i>&nbsp; Transportation Icons</a></li>

BIN
src/assets/font-awesome/fonts/FontAwesome.otf


BIN
src/assets/font-awesome/fonts/fontawesome-webfont.eot


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 7 - 7
src/assets/font-awesome/fonts/fontawesome-webfont.svg


BIN
src/assets/font-awesome/fonts/fontawesome-webfont.ttf


BIN
src/assets/font-awesome/fonts/fontawesome-webfont.woff


BIN
src/assets/font-awesome/fonts/fontawesome-webfont.woff2


+ 159 - 0
src/icons.yml

@@ -5481,6 +5481,8 @@ icons:
     id:         safari
     unicode:    f267
     created:    4.4
+    filter:
+      - browser
     categories:
       - Brand Icons
 
@@ -5488,6 +5490,8 @@ icons:
     id:         chrome
     unicode:    f268
     created:    4.4
+    filter:
+      - browser
     categories:
       - Brand Icons
 
@@ -5495,6 +5499,8 @@ icons:
     id:         firefox
     unicode:    f269
     created:    4.4
+    filter:
+      - browser
     categories:
       - Brand Icons
 
@@ -5509,6 +5515,9 @@ icons:
     id:         internet-explorer
     unicode:    f26b
     created:    4.4
+    filter:
+      - browser
+      - ie
     categories:
       - Brand Icons
 
@@ -5650,3 +5659,153 @@ icons:
     url:        fonticons.com
     categories:
       - Brand Icons
+
+  - name:       reddit Alien
+    id:         reddit-alien
+    unicode:    f281
+    created:    4.5
+    categories:
+      - Brand Icons
+
+  - name:       Edge Browser
+    id:         edge
+    unicode:    f282
+    created:    4.5
+    filter:
+      - browser
+      - ie
+    categories:
+      - Brand Icons
+
+  - name:       Credit Card
+    id:         credit-card-alt
+    unicode:    f283
+    created:    4.5
+    filter:
+      - credit card
+    categories:
+      - Brand Icons
+      - Payment Icons
+
+  - name:       Codie Pie
+    id:         codiepie
+    unicode:    f284
+    created:    4.5
+    url:        codiepie.com
+    categories:
+      - Brand Icons
+
+  - name:       MODX
+    id:         modx
+    unicode:    f285
+    created:    4.5
+    categories:
+      - Brand Icons
+
+  - name:       Fort Awesome
+    id:         fort-awesome
+    unicode:    f286
+    created:    4.5
+    categories:
+      - Brand Icons
+
+  - name:       USB
+    id:         usb
+    unicode:    f287
+    created:    4.5
+    categories:
+      - Brand Icons
+
+  - name:       Product Hunt
+    id:         product-hunt
+    unicode:    f288
+    created:    4.5
+    categories:
+      - Brand Icons
+
+  - name:       Mixcloud
+    id:         mixcloud
+    unicode:    f289
+    created:    4.5
+    categories:
+      - Brand Icons
+
+  - name:       Scribd
+    id:         scribd
+    unicode:    f28a
+    created:    4.5
+    categories:
+      - Brand Icons
+
+  - name:       Pause Circle
+    id:         pause-circle
+    unicode:    f28b
+    created:    4.5
+    categories:
+      - Video Player Icons
+
+  - name:       Pause Circle Outlined
+    id:         pause-circle-o
+    unicode:    f28c
+    created:    4.5
+    categories:
+      - Video Player Icons
+
+  - name:       Stop Circle
+    id:         stop-circle
+    unicode:    f28d
+    created:    4.5
+    categories:
+      - Video Player Icons
+
+  - name:       Stop Circle Outlined
+    id:         stop-circle-o
+    unicode:    f28e
+    created:    4.5
+    categories:
+      - Video Player Icons
+
+
+  - name:       Shopping Bag
+    id:         shopping-bag
+    unicode:    f290
+    created:    4.5
+    categories:
+      - Web Application Icons
+
+  - name:       Shopping Basket
+    id:         shopping-basket
+    unicode:    f291
+    created:    4.5
+    categories:
+      - Web Application Icons
+
+  - name:       Hashtag
+    id:         hashtag
+    unicode:    f292
+    created:    4.5
+    categories:
+      - Web Application Icons
+
+  - name:       Bluetooth
+    id:         bluetooth
+    unicode:    f293
+    created:    4.5
+    categories:
+      - Web Application Icons
+      - Brand Icons
+
+  - name:       Bluetooth
+    id:         bluetooth-b
+    unicode:    f294
+    created:    4.5
+    categories:
+      - Web Application Icons
+      - Brand Icons
+
+  - name:       Percent
+    id:         percent
+    unicode:    f295
+    created:    4.5
+    categories:
+      - Web Application Icons

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio