Merge pull request #9117 from FortAwesome/4.6.2-wip

4.6.2 release.

README.md

@@ -1,7 +1,7 @@
-# [Font Awesome v4.6.1](http://fontawesome.io)
+# [Font Awesome v4.6.2](http://fontawesome.io)
 ### The iconic font and CSS framework
 
-Font Awesome is a full suite of 628 pictographic icons for easy scalable vector graphics on websites,
+Font Awesome is a full suite of 632 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).
@@ -20,6 +20,7 @@ Get started at http://fontawesome.io!
 - Full details: http://fontawesome.io/license/
 
 ## Changelog
+- [v4.6.2 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/9117)
 - [v4.6.1 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/8962)
 - [v4.6.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.6.0+is%3Aclosed)
 - [v4.5.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.5.0+is%3Aclosed)
@@ -55,7 +56,7 @@ And constructed with the following guidelines:
 
 * Breaking backward compatibility bumps the major (and resets the minor and patch)
 * New additions, including new icons, without breaking backward compatibility bumps the minor (and resets the patch)
-* Bug fixes and misc changes bumps the patch
+* Bug fixes, changes to brand logos, and misc changes bumps the patch
 
 For more information on SemVer, please visit http://semver.org.
 

_config.yml

@@ -19,10 +19,10 @@ icon_layout:      icon.html    # Relative to _layouts directory
 icon_destination: icon         # Relative to destination
 
 fontawesome:
-  version:        4.6.1
+  version:        4.6.2
   minor_version:  4.6
   major_version:  4
-  doc_blob:       v4.6.1
+  doc_blob:       v4.6.2
   url:            http://fontawesome.io
   legacy_url:     http://fortawesome.github.com/Font-Awesome/
   blog_url:       http://articles.fortawesome.com

component.json

@@ -2,7 +2,7 @@
   "name": "font-awesome",
   "repo": "FortAwesome/Font-Awesome",
   "description": "Font Awesome",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "keywords": [],
   "dependencies": {},
   "development": {},

composer.json

@@ -13,7 +13,7 @@
   ],
   "extra": {
     "branch-alias": {
-      "dev-master": "4.0.x-dev"
+      "dev-master": "4.6.x-dev"
     }
   },
   "license": [

css/font-awesome.css

@@ -1,13 +1,13 @@
 /*!
- *  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
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.6.1');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.6.1') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.6.2');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.2') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.6.2') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.6.2') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.6.2') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.6.2#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -1383,7 +1383,7 @@
 .fa-digg:before {
   content: "\f1a6";
 }
-.fa-pied-piper:before {
+.fa-pied-piper-pp:before {
   content: "\f1a7";
 }
 .fa-pied-piper-alt:before {
@@ -1509,6 +1509,7 @@
   content: "\f1ce";
 }
 .fa-ra:before,
+.fa-resistance:before,
 .fa-rebel:before {
   content: "\f1d0";
 }
@@ -2157,6 +2158,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;

less/font-awesome.less

@@ -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)
  */
 

less/icons.less

@@ -438,7 +438,7 @@
 .@{fa-css-prefix}-stumbleupon:before { content: @fa-var-stumbleupon; }
 .@{fa-css-prefix}-delicious:before { content: @fa-var-delicious; }
 .@{fa-css-prefix}-digg:before { content: @fa-var-digg; }
-.@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; }
+.@{fa-css-prefix}-pied-piper-pp:before { content: @fa-var-pied-piper-pp; }
 .@{fa-css-prefix}-pied-piper-alt:before { content: @fa-var-pied-piper-alt; }
 .@{fa-css-prefix}-drupal:before { content: @fa-var-drupal; }
 .@{fa-css-prefix}-joomla:before { content: @fa-var-joomla; }
@@ -488,6 +488,7 @@
 .@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; }
 .@{fa-css-prefix}-circle-o-notch:before { content: @fa-var-circle-o-notch; }
 .@{fa-css-prefix}-ra:before,
+.@{fa-css-prefix}-resistance:before,
 .@{fa-css-prefix}-rebel:before { content: @fa-var-rebel; }
 .@{fa-css-prefix}-ge:before,
 .@{fa-css-prefix}-empire:before { content: @fa-var-empire; }
@@ -722,3 +723,7 @@
 .@{fa-css-prefix}-snapchat:before { content: @fa-var-snapchat; }
 .@{fa-css-prefix}-snapchat-ghost:before { content: @fa-var-snapchat-ghost; }
 .@{fa-css-prefix}-snapchat-square:before { content: @fa-var-snapchat-square; }
+.@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; }
+.@{fa-css-prefix}-first-order:before { content: @fa-var-first-order; }
+.@{fa-css-prefix}-yoast:before { content: @fa-var-yoast; }
+.@{fa-css-prefix}-themeisle:before { content: @fa-var-themeisle; }

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.6.1/fonts"; // for referencing Bootstrap CDN font files directly
+//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.6.2/fonts"; // for referencing Bootstrap CDN font files directly
 @fa-css-prefix:       fa;
-@fa-version:          "4.6.1";
+@fa-version:          "4.6.2";
 @fa-border-color:     #eee;
 @fa-inverse:          #fff;
 @fa-li-width:         (30em / 14);
@@ -274,6 +274,7 @@
 @fa-var-fire: "\f06d";
 @fa-var-fire-extinguisher: "\f134";
 @fa-var-firefox: "\f269";
+@fa-var-first-order: "\f2b0";
 @fa-var-flag: "\f024";
 @fa-var-flag-checkered: "\f11e";
 @fa-var-flag-o: "\f11d";
@@ -482,8 +483,9 @@
 @fa-var-photo: "\f03e";
 @fa-var-picture-o: "\f03e";
 @fa-var-pie-chart: "\f200";
-@fa-var-pied-piper: "\f1a7";
+@fa-var-pied-piper: "\f2ae";
 @fa-var-pied-piper-alt: "\f1a8";
+@fa-var-pied-piper-pp: "\f1a7";
 @fa-var-pinterest: "\f0d2";
 @fa-var-pinterest-p: "\f231";
 @fa-var-pinterest-square: "\f0d3";
@@ -522,6 +524,7 @@
 @fa-var-repeat: "\f01e";
 @fa-var-reply: "\f112";
 @fa-var-reply-all: "\f122";
+@fa-var-resistance: "\f1d0";
 @fa-var-retweet: "\f079";
 @fa-var-rmb: "\f157";
 @fa-var-road: "\f018";
@@ -636,6 +639,7 @@
 @fa-var-th: "\f00a";
 @fa-var-th-large: "\f009";
 @fa-var-th-list: "\f00b";
+@fa-var-themeisle: "\f2b2";
 @fa-var-thumb-tack: "\f08d";
 @fa-var-thumbs-down: "\f165";
 @fa-var-thumbs-o-down: "\f088";
@@ -729,6 +733,7 @@
 @fa-var-yc-square: "\f1d4";
 @fa-var-yelp: "\f1e9";
 @fa-var-yen: "\f157";
+@fa-var-yoast: "\f2b1";
 @fa-var-youtube: "\f167";
 @fa-var-youtube-play: "\f16a";
 @fa-var-youtube-square: "\f166";

package.json

@@ -1,7 +1,7 @@
 {
   "name": "font-awesome",
   "description": "The iconic font and CSS framework",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "style": "css/font-awesome.css",
   "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"],
   "homepage": "http://fontawesome.io/",

scss/_icons.scss

@@ -438,7 +438,7 @@
 .#{$fa-css-prefix}-stumbleupon:before { content: $fa-var-stumbleupon; }
 .#{$fa-css-prefix}-delicious:before { content: $fa-var-delicious; }
 .#{$fa-css-prefix}-digg:before { content: $fa-var-digg; }
-.#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; }
+.#{$fa-css-prefix}-pied-piper-pp:before { content: $fa-var-pied-piper-pp; }
 .#{$fa-css-prefix}-pied-piper-alt:before { content: $fa-var-pied-piper-alt; }
 .#{$fa-css-prefix}-drupal:before { content: $fa-var-drupal; }
 .#{$fa-css-prefix}-joomla:before { content: $fa-var-joomla; }
@@ -488,6 +488,7 @@
 .#{$fa-css-prefix}-life-ring:before { content: $fa-var-life-ring; }
 .#{$fa-css-prefix}-circle-o-notch:before { content: $fa-var-circle-o-notch; }
 .#{$fa-css-prefix}-ra:before,
+.#{$fa-css-prefix}-resistance:before,
 .#{$fa-css-prefix}-rebel:before { content: $fa-var-rebel; }
 .#{$fa-css-prefix}-ge:before,
 .#{$fa-css-prefix}-empire:before { content: $fa-var-empire; }
@@ -722,3 +723,7 @@
 .#{$fa-css-prefix}-snapchat:before { content: $fa-var-snapchat; }
 .#{$fa-css-prefix}-snapchat-ghost:before { content: $fa-var-snapchat-ghost; }
 .#{$fa-css-prefix}-snapchat-square:before { content: $fa-var-snapchat-square; }
+.#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; }
+.#{$fa-css-prefix}-first-order:before { content: $fa-var-first-order; }
+.#{$fa-css-prefix}-yoast:before { content: $fa-var-yoast; }
+.#{$fa-css-prefix}-themeisle:before { content: $fa-var-themeisle; }

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.6.1/fonts" !default; // for referencing Bootstrap CDN font files directly
+//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.6.2/fonts" !default; // for referencing Bootstrap CDN font files directly
 $fa-css-prefix:       fa !default;
-$fa-version:          "4.6.1" !default;
+$fa-version:          "4.6.2" !default;
 $fa-border-color:     #eee !default;
 $fa-inverse:          #fff !default;
 $fa-li-width:         (30em / 14) !default;
@@ -274,6 +274,7 @@ $fa-var-filter: "\f0b0";
 $fa-var-fire: "\f06d";
 $fa-var-fire-extinguisher: "\f134";
 $fa-var-firefox: "\f269";
+$fa-var-first-order: "\f2b0";
 $fa-var-flag: "\f024";
 $fa-var-flag-checkered: "\f11e";
 $fa-var-flag-o: "\f11d";
@@ -482,8 +483,9 @@ $fa-var-phone-square: "\f098";
 $fa-var-photo: "\f03e";
 $fa-var-picture-o: "\f03e";
 $fa-var-pie-chart: "\f200";
-$fa-var-pied-piper: "\f1a7";
+$fa-var-pied-piper: "\f2ae";
 $fa-var-pied-piper-alt: "\f1a8";
+$fa-var-pied-piper-pp: "\f1a7";
 $fa-var-pinterest: "\f0d2";
 $fa-var-pinterest-p: "\f231";
 $fa-var-pinterest-square: "\f0d3";
@@ -522,6 +524,7 @@ $fa-var-reorder: "\f0c9";
 $fa-var-repeat: "\f01e";
 $fa-var-reply: "\f112";
 $fa-var-reply-all: "\f122";
+$fa-var-resistance: "\f1d0";
 $fa-var-retweet: "\f079";
 $fa-var-rmb: "\f157";
 $fa-var-road: "\f018";
@@ -636,6 +639,7 @@ $fa-var-text-width: "\f035";
 $fa-var-th: "\f00a";
 $fa-var-th-large: "\f009";
 $fa-var-th-list: "\f00b";
+$fa-var-themeisle: "\f2b2";
 $fa-var-thumb-tack: "\f08d";
 $fa-var-thumbs-down: "\f165";
 $fa-var-thumbs-o-down: "\f088";
@@ -729,6 +733,7 @@ $fa-var-yc: "\f23b";
 $fa-var-yc-square: "\f1d4";
 $fa-var-yelp: "\f1e9";
 $fa-var-yen: "\f157";
+$fa-var-yoast: "\f2b1";
 $fa-var-youtube: "\f167";
 $fa-var-youtube-play: "\f16a";
 $fa-var-youtube-square: "\f166";

scss/font-awesome.scss

@@ -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)
  */
 

src/README.md-nobuild

@@ -22,6 +22,7 @@ Get started at {{ site.fontawesome.url }}!
 - Full details: http://fontawesome.io/license/
 
 ## Changelog
+- [v4.6.2 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/9117)
 - [v4.6.1 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/8962)
 - [v4.6.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.6.0+is%3Aclosed)
 - [v4.5.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.5.0+is%3Aclosed)
@@ -57,7 +58,7 @@ And constructed with the following guidelines:
 
 * Breaking backward compatibility bumps the major (and resets the minor and patch)
 * New additions, including new icons, without breaking backward compatibility bumps the minor (and resets the patch)
-* Bug fixes and misc changes bumps the patch
+* Bug fixes, changes to brand logos, and misc changes bumps the patch
 
 For more information on SemVer, please visit http://semver.org.
 

src/assets/less/site/bootstrap/jumbotron.less

@@ -29,17 +29,6 @@
   .text-muted {
     color: mix(@jumbotron-color, @fa-green, 45%);
   }
-
-  a {
-    color: mix(@jumbotron-color, @fa-green, 70%);
-
-    // STATE: hover, focus, active
-    &:hover, &:focus, &:active {
-      border-color: @fa-green-dark;
-      background: @fa-green-dark;
-      color: @jumbotron-color;
-    }
-  }
 }
 
 .jumbotron-ad, .jumbotron-carousel {

src/assets/less/site/jumbotron-carousel.less

@@ -58,4 +58,14 @@
       }
     }
   }
+  a {
+    color: mix(@jumbotron-color, @fa-green, 70%);
+
+    // STATE: hover, focus, active
+    &:hover, &:focus, &:active {
+      border-color: @fa-green-dark;
+      background: @fa-green-dark;
+      color: @jumbotron-color;
+    }
+  }
 }

src/icons.yml

@@ -4123,8 +4123,8 @@ icons:
     categories:
       - Brand Icons
 
-  - name:       Pied Piper Logo
-    id:         pied-piper
+  - name:       Pied Piper PP Logo (Old)
+    id:         pied-piper-pp
     unicode:    f1a7
     created:    4.1
     categories:
@@ -4439,6 +4439,7 @@ icons:
     created:    4.1
     aliases:
       - ra
+      - resistance
     categories:
       - Brand Icons
 
@@ -6129,3 +6130,34 @@ icons:
     created:    4.6
     categories:
       - Brand Icons
+
+  - name:       Pied Piper Logo
+    id:         pied-piper
+    unicode:    f2ae
+    created:    4.6
+    categories:
+      - Brand Icons
+
+
+  - name:       First Order
+    id:         first-order
+    unicode:    f2b0
+    created:    4.6
+    categories:
+      - Brand Icons
+
+  - name:       Yoast
+    id:         yoast
+    unicode:    f2b1
+    created:    4.6
+    url:        yoast.com
+    categories:
+      - Brand Icons
+
+  - name:       ThemeIsle
+    id:         themeisle
+    unicode:    f2b2
+    created:    4.6
+    url:        themeisle.com
+    categories:
+      - Brand Icons