Merge pull request #9189 from FortAwesome/4.6.3-wip

4.6.3 Patch Release

README.md

@@ -1,7 +1,7 @@
-# [Font Awesome v4.6.2](http://fontawesome.io)
+# [Font Awesome v4.6.3](http://fontawesome.io)
 ### The iconic font and CSS framework
 
-Font Awesome is a full suite of 632 pictographic icons for easy scalable vector graphics on websites,
+Font Awesome is a full suite of 634 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.3 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/9189)
 - [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)

_config.yml

@@ -19,10 +19,10 @@ icon_layout:      icon.html    # Relative to _layouts directory
 icon_destination: icon         # Relative to destination
 
 fontawesome:
-  version:        4.6.2
+  version:        4.6.3
   minor_version:  4.6
   major_version:  4
-  doc_blob:       v4.6.2
+  doc_blob:       v4.6.3
   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.2",
+  "version": "4.6.3",
   "keywords": [],
   "dependencies": {},
   "development": {},

css/font-awesome.css

@@ -1,13 +1,13 @@
 /*!
- *  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
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  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');
+  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');
   font-weight: normal;
   font-style: normal;
 }
@@ -2170,6 +2170,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;

less/font-awesome.less

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

less/icons.less

@@ -727,3 +727,7 @@
 .@{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; }
+.@{fa-css-prefix}-google-plus-circle:before,
+.@{fa-css-prefix}-google-plus-official:before { content: @fa-var-google-plus-official; }
+.@{fa-css-prefix}-fa:before,
+.@{fa-css-prefix}-font-awesome:before { content: @fa-var-font-awesome; }

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.2/fonts"; // for referencing Bootstrap CDN font files directly
+//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.6.3/fonts"; // for referencing Bootstrap CDN font files directly
 @fa-css-prefix:       fa;
-@fa-version:          "4.6.2";
+@fa-version:          "4.6.3";
 @fa-border-color:     #eee;
 @fa-inverse:          #fff;
 @fa-li-width:         (30em / 14);
@@ -240,6 +240,7 @@
 @fa-var-eye: "\f06e";
 @fa-var-eye-slash: "\f070";
 @fa-var-eyedropper: "\f1fb";
+@fa-var-fa: "\f2b4";
 @fa-var-facebook: "\f09a";
 @fa-var-facebook-f: "\f09a";
 @fa-var-facebook-official: "\f230";
@@ -287,6 +288,7 @@
 @fa-var-folder-open: "\f07c";
 @fa-var-folder-open-o: "\f115";
 @fa-var-font: "\f031";
+@fa-var-font-awesome: "\f2b4";
 @fa-var-fonticons: "\f280";
 @fa-var-fort-awesome: "\f286";
 @fa-var-forumbee: "\f211";
@@ -318,6 +320,8 @@
 @fa-var-globe: "\f0ac";
 @fa-var-google: "\f1a0";
 @fa-var-google-plus: "\f0d5";
+@fa-var-google-plus-circle: "\f2b3";
+@fa-var-google-plus-official: "\f2b3";
 @fa-var-google-plus-square: "\f0d4";
 @fa-var-google-wallet: "\f1ee";
 @fa-var-graduation-cap: "\f19d";

package.json

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

scss/_icons.scss

@@ -727,3 +727,7 @@
 .#{$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; }
+.#{$fa-css-prefix}-google-plus-circle:before,
+.#{$fa-css-prefix}-google-plus-official:before { content: $fa-var-google-plus-official; }
+.#{$fa-css-prefix}-fa:before,
+.#{$fa-css-prefix}-font-awesome:before { content: $fa-var-font-awesome; }

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.2/fonts" !default; // for referencing Bootstrap CDN font files directly
+//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.6.3/fonts" !default; // for referencing Bootstrap CDN font files directly
 $fa-css-prefix:       fa !default;
-$fa-version:          "4.6.2" !default;
+$fa-version:          "4.6.3" !default;
 $fa-border-color:     #eee !default;
 $fa-inverse:          #fff !default;
 $fa-li-width:         (30em / 14) !default;
@@ -240,6 +240,7 @@ $fa-var-external-link-square: "\f14c";
 $fa-var-eye: "\f06e";
 $fa-var-eye-slash: "\f070";
 $fa-var-eyedropper: "\f1fb";
+$fa-var-fa: "\f2b4";
 $fa-var-facebook: "\f09a";
 $fa-var-facebook-f: "\f09a";
 $fa-var-facebook-official: "\f230";
@@ -287,6 +288,7 @@ $fa-var-folder-o: "\f114";
 $fa-var-folder-open: "\f07c";
 $fa-var-folder-open-o: "\f115";
 $fa-var-font: "\f031";
+$fa-var-font-awesome: "\f2b4";
 $fa-var-fonticons: "\f280";
 $fa-var-fort-awesome: "\f286";
 $fa-var-forumbee: "\f211";
@@ -318,6 +320,8 @@ $fa-var-glide-g: "\f2a6";
 $fa-var-globe: "\f0ac";
 $fa-var-google: "\f1a0";
 $fa-var-google-plus: "\f0d5";
+$fa-var-google-plus-circle: "\f2b3";
+$fa-var-google-plus-official: "\f2b3";
 $fa-var-google-plus-square: "\f0d4";
 $fa-var-google-wallet: "\f1ee";
 $fa-var-graduation-cap: "\f19d";

scss/font-awesome.scss

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

src/README.md-nobuild

@@ -22,6 +22,7 @@ Get started at {{ site.fontawesome.url }}!
 - Full details: http://fontawesome.io/license/
 
 ## Changelog
+- [v4.6.3 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/9189)
 - [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)

src/_includes/jumbotron-carousel.html

@@ -24,7 +24,7 @@
         <div id="icon-carousel" class="carousel slide">
           <!-- Carousel items -->
           <div class="carousel-inner">
-            <div class="active item"><div><i class="fa fa-flag" aria-hidden="true"></i><span class="sr-only">flag icon</span></div></div>
+            <div class="active item"><div><i class="fa fa-font-awesome" aria-hidden="true"></i><span class="sr-only">flag icon</span></div></div>
             <div class="item"><div><i class="fa fa-universal-access" aria-hidden="true"></i><span class="sr-only">fort awesome icon</span></div></div>
             <div class="item"><div><i class="fa fa-fort-awesome" aria-hidden="true"></i><span class="sr-only">fort awesome icon</span></div></div>
             <div class="item"><div><i class="fa fa-commenting" aria-hidden="true"></i><span class="sr-only">commenting icon</span></div></div>

src/_includes/navbar.html

@@ -16,13 +16,13 @@
     <ul class="nav navbar-nav navbar-right">
       <li>
         <a href="http://fortawesome.com/?utm_source=font_awesome_navbar&utm_medium=display&utm_content=ad_1_next_level&utm_campaign=promo_5.0_update" data-toggle="tooltip" data-container="body" data-placement="bottom" data-html="true" title="Take your front end game<br>to the next level!">
-          <i class="fas fas-fort-logo fas-lg valign-baseline"></i>&nbsp;
+          <i class="fa fa-fort-awesome fa-lg valign-baseline"></i>&nbsp;
           Fort Awesome
         </a>
       </li>
       <li class="active">
         <a href="http://fontawesome.io/?utm_source=font_awesome_navbar&utm_medium=display&utm_content=font_awesome_navbar&utm_campaign=promo_5.0_update" data-toggle="tooltip" data-container="body" data-placement="bottom" data-html="true" title="The iconic font<br>&amp; CSS toolkit">
-          <i class="fas fas-flag-logo"></i>&nbsp;
+          <i class="fa fa-font-awesome"></i>&nbsp;
           Font Awesome</a>
       </li>
     </ul>
@@ -37,7 +37,7 @@
         <i class="fa fa-bars fa-lg" aria-hidden="true" title="Toggle navigation"></i>
         <span class="sr-only">Toggle navigation</span>
       </button>
-      <a class="navbar-brand" href="{{ page.relative_path }}"><i class="fas fas-flag-logo fas-lg" aria-hidden="true"></i> Font Awesome</a>
+      <a class="navbar-brand" href="{{ page.relative_path }}"><i class="fa fa-font-awesome" aria-hidden="true"></i> Font Awesome</a>
     </div>
 
     <div class="navbar-collapse collapse">

src/assets/less/site/bootstrap/navbar.less

@@ -6,9 +6,10 @@
   font-family: @font-family-serif;
   font-weight: 300;
   font-size: 20px;
-  .fas-flag-logo {
+  i {
+    font-size: 23px;
     padding-right: 3px;
-    vertical-align: baseline;
+    line-height: .75;
   }
 }
 .navbar-nav > li > a { padding: 11px 10px 9px; }

src/icons.yml

@@ -3640,7 +3640,7 @@ icons:
   - name:       Instagram
     id:         instagram
     unicode:    f16d
-    created:    3.2
+    created:    4.6
     categories:
       - Brand Icons
 
@@ -5838,6 +5838,7 @@ icons:
     id:         fort-awesome
     unicode:    f286
     created:    4.5
+    url:        fortawesome.com
     categories:
       - Brand Icons
 
@@ -6161,3 +6162,21 @@ icons:
     url:        themeisle.com
     categories:
       - Brand Icons
+
+  - name:       Google Plus Official
+    id:         google-plus-official
+    unicode:    f2b3
+    created:    4.6
+    aliases:
+      - google-plus-circle
+    categories:
+      - Brand Icons
+
+  - name:       Font Awesome
+    id:         font-awesome
+    unicode:    f2b4
+    created:    4.6
+    aliases:
+      - fa
+    categories:
+      - Brand Icons

src/test/all.html

@@ -14,13 +14,22 @@ relative_path: ../../
     <div class="container">
       <div>
         <h1>All</h1>
+        <div>
+          {% for icon in icons %}
+          <i class="fa fa-{{ icon.id }}"></i>{% endfor %}
+        </div>
+      </div>
+
+
+      <div>
+        <h1>All (Unicode)</h1>
         {% for icon in icons %}
         <i class="fa">&#x{{ icon.unicode }}</i>
         {% endfor %}
       </div>
 
       <div>
-        <h1>Non-Brand</h1>
+        <h1>Non-Brand (Unicode)</h1>
 
         {% for icon in icons %}
           {% unless icon.categories contains "Brand Icons" %}
@@ -30,7 +39,7 @@ relative_path: ../../
       </div>
 
       <div>
-        <h1>Brand</h1>
+        <h1>Brand (Unicode)</h1>
 
         {% for icon in icons %}
           {% if icon.categories contains "Brand Icons" %}