merged conflicts

CONTRIBUTING.md

@@ -4,6 +4,21 @@ Looking to contribute something to Font Awesome? **Here's how you can help.**
 
 
 
+## Requesting new icons
+
+New icons mostly start as requests by the [Font Awesome community on GitHub](../../issues). Want to request a new icon? Here are some things to keep in mind:
+
+1. Please be nice. Font Awesome is a happy place.
+2. Please [search](../../search?type=Issues) to see if your icon request already exists. If a request is found, please +1 that one.
+3. Please make requests for single icons, unless you are requesting a couple of strictly related icons (e.g., thumbs-up/thumbs-down).
+4. Please and thank you if you include the following:
+  - Title your [new issue](../../issues/new?title=Icon%20Request:%20icon-) `Icon request: icon-name` (e.g., `Icon request: icon-car`).
+  - Include a few use cases for your requested icon. How do you plan on using it?
+  - Attach a single color image or two that represent the idea you're going for.
+  - Request concrete objects: it's harder to make an icon to represent happiness, it's easier to make a smiley face. ☺
+
+
+
 ## Reporting issues
 
 We only accept issues that are icon requests, bug reports, or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Font Awesome core. Please read the following guidelines to ensure you are the paragon of bug reporting.

Gemfile.lock

@@ -8,12 +8,12 @@ GEM
     columnize (0.8.9)
     commander (4.1.6)
       highline (~> 1.6.11)
-    debugger (1.6.6)
+    debugger (1.6.8)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.2)
+      debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.4)
+    debugger-ruby_core_source (1.3.5)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
     highline (1.6.21)
@@ -41,9 +41,9 @@ GEM
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
+    rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
     redcarpet (2.3.0)
     safe_yaml (1.0.3)

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "font-awesome",
   "description": "Font Awesome",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "keywords": [],
   "homepage": "http://fontawesome.io",
   "dependencies": {},

component.json

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

css/font-awesome.css

@@ -86,25 +86,31 @@
 @-moz-keyframes fa-spin {
   0% {
     -moz-transform: rotate(0deg);
+    transform: rotate(0deg);
   }
   100% {
     -moz-transform: rotate(359deg);
+    transform: rotate(359deg);
   }
 }
-@-webkit-keyframes fa-spin {
+@-o-keyframes fa-spin {
   0% {
-    -webkit-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
   }
   100% {
-    -webkit-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    transform: rotate(359deg);
   }
 }
-@-o-keyframes fa-spin {
+@-webkit-keyframes fa-spin {
   0% {
-    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
   }
   100% {
-    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
   }
 }
 @keyframes fa-spin {
@@ -157,6 +163,13 @@
   -o-transform: scale(1, -1);
   transform: scale(1, -1);
 }
+:root .fa-rotate-90,
+:root .fa-rotate-180,
+:root .fa-rotate-270,
+:root .fa-flip-horizontal,
+:root .fa-flip-vertical {
+  filter: none;
+}
 .fa-stack {
   position: relative;
   display: inline-block;
@@ -1497,6 +1510,7 @@
   content: "\f1cc";
 }
 .fa-life-bouy:before,
+.fa-life-buoy:before,
 .fa-life-saver:before,
 .fa-support:before,
 .fa-life-ring:before {

fonts/fontawesome-webfont.eot

@@ -477,6 +477,7 @@
 .@{fa-css-prefix}-codepen:before { content: @fa-var-codepen; }
 .@{fa-css-prefix}-jsfiddle:before { content: @fa-var-jsfiddle; }
 .@{fa-css-prefix}-life-bouy:before,
+.@{fa-css-prefix}-life-buoy:before,
 .@{fa-css-prefix}-life-saver:before,
 .@{fa-css-prefix}-support:before,
 .@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; }

less/list.less

@@ -14,6 +14,6 @@
   top: (2em / 14);
   text-align: center;
   &.@{fa-css-prefix}-lg {
-    left: -@fa-li-width + (4em / 14);
+    left: (-@fa-li-width + (4em / 14));
   }
 }

less/path.less

@@ -3,11 +3,11 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}')";
-  src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype')",
-    ~"url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff')",
-    ~"url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype')",
-    ~"url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg')";
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
+    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
 //  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;

less/rotated-flipped.less

@@ -7,3 +7,14 @@
 
 .@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
 .@{fa-css-prefix}-flip-vertical   { .fa-icon-flip(1, -1, 2); }
+
+// Hook for IE8-9
+// -------------------------
+
+:root .@{fa-css-prefix}-rotate-90,
+:root .@{fa-css-prefix}-rotate-180,
+:root .@{fa-css-prefix}-rotate-270,
+:root .@{fa-css-prefix}-flip-horizontal,
+:root .@{fa-css-prefix}-flip-vertical {
+  filter: none;
+}

less/spinning.less

@@ -9,16 +9,34 @@
 }
 
 @-moz-keyframes fa-spin {
-  0% { -moz-transform: rotate(0deg); }
-  100% { -moz-transform: rotate(359deg); }
-}
-@-webkit-keyframes fa-spin {
-  0% { -webkit-transform: rotate(0deg); }
-  100% { -webkit-transform: rotate(359deg); }
+  0% {
+    -moz-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -moz-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
 }
 @-o-keyframes fa-spin {
-  0% { -o-transform: rotate(0deg); }
-  100% { -o-transform: rotate(359deg); }
+  0% {
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -o-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
 }
 @keyframes fa-spin {
   0% {

less/variables.less

@@ -272,6 +272,7 @@
 @fa-var-level-down: "\f149";
 @fa-var-level-up: "\f148";
 @fa-var-life-bouy: "\f1cd";
+@fa-var-life-buoy: "\f1cd";
 @fa-var-life-ring: "\f1cd";
 @fa-var-life-saver: "\f1cd";
 @fa-var-lightbulb-o: "\f0eb";

package.json

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

scss/_icons.scss

@@ -477,6 +477,7 @@
 .#{$fa-css-prefix}-codepen:before { content: $fa-var-codepen; }
 .#{$fa-css-prefix}-jsfiddle:before { content: $fa-var-jsfiddle; }
 .#{$fa-css-prefix}-life-bouy:before,
+.#{$fa-css-prefix}-life-buoy:before,
 .#{$fa-css-prefix}-life-saver:before,
 .#{$fa-css-prefix}-support:before,
 .#{$fa-css-prefix}-life-ring:before { content: $fa-var-life-ring; }

scss/_rotated-flipped.scss

@@ -7,3 +7,14 @@
 
 .#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); }
 .#{$fa-css-prefix}-flip-vertical   { @include fa-icon-flip(1, -1, 2); }
+
+// Hook for IE8-9
+// -------------------------
+
+:root .#{$fa-css-prefix}-rotate-90,
+:root .#{$fa-css-prefix}-rotate-180,
+:root .#{$fa-css-prefix}-rotate-270,
+:root .#{$fa-css-prefix}-flip-horizontal,
+:root .#{$fa-css-prefix}-flip-vertical {
+  filter: none;
+}

scss/_spinning.scss

@@ -9,16 +9,34 @@
 }
 
 @-moz-keyframes fa-spin {
-  0% { -moz-transform: rotate(0deg); }
-  100% { -moz-transform: rotate(359deg); }
-}
-@-webkit-keyframes fa-spin {
-  0% { -webkit-transform: rotate(0deg); }
-  100% { -webkit-transform: rotate(359deg); }
+  0% {
+    -moz-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -moz-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
 }
 @-o-keyframes fa-spin {
-  0% { -o-transform: rotate(0deg); }
-  100% { -o-transform: rotate(359deg); }
+  0% {
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -o-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
 }
 @keyframes fa-spin {
   0% {

scss/_variables.scss

@@ -272,6 +272,7 @@ $fa-var-lemon-o: "\f094";
 $fa-var-level-down: "\f149";
 $fa-var-level-up: "\f148";
 $fa-var-life-bouy: "\f1cd";
+$fa-var-life-buoy: "\f1cd";
 $fa-var-life-ring: "\f1cd";
 $fa-var-life-saver: "\f1cd";
 $fa-var-lightbulb-o: "\f0eb";

src/3.2.1/assets/css/prettify.css

@@ -7,21 +7,23 @@
   </p>
   <ol>
     <li>Please be nice. Font Awesome is a happy place.</li>
-    <li>Please <a href="{{ site.fontawesome.github.url }}/search?type=Issues">search</a> to see if your icon request already exists.</li>
+    <li>Please <a href="{{ site.fontawesome.github.url }}/search?type=Issues">search</a> to see if your icon request already exists. If a request is found, please +1 that one.</li>
+    <li>
+      Please make requests for single icons, unless you are requesting a couple of strictly related icons (e.g., thumbs-up/thumbs-down).
+    </li>
     <li>
       Please and thank you if you include the following:
       <ul>
         <li>
-          Title your <a href="{{ site.fontawesome.github.url }}/issues/new?title=Icon%20Request:%20icon-name">new issue</a>
-          <code>Icon request: icon-name</code>.
+          Title your <a href="{{ site.fontawesome.github.url }}/issues/new?title=Icon%20Request:%20fa-">new issue</a>
+          <code>Icon request: icon-name</code> (e.g., <code>Icon request: icon-car</code>).
         </li>
         <li>Include a few use cases for your requested icon. How do you plan on using it?</li>
         <li>Attach a single color image or two that represent the idea you're going for.</li>
       </ul>
     </li>
     <li>
-      Concrete objects make good icons, since abstract concepts are, well, abstract. It's harder to make an icon
-      to represent happiness. It's easier to make a smiley face. <i class="fa fa-smile"></i>
+      Request concrete objects: it's harder to make an icon to represent happiness, it's easier to make a smiley face.  <i class="fa fa-smile-o"></i>
     </li>
   </ol>
 </section>

src/assets/css/prettify.css

@@ -17,6 +17,6 @@
   top: (2em / 14);
   text-align: center;
   &.@{fa-css-prefix}-lg {
-    left: -@fa-li-width + (4em / 14);
+    left: (-@fa-li-width + (4em / 14));
   }
 }

src/assets/font-awesome/less/path.less

@@ -3,11 +3,11 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}')";
-  src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype')",
-    ~"url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff')",
-    ~"url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype')",
-    ~"url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg')";
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
+    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
 //  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;

src/assets/font-awesome/less/rotated-flipped.less

@@ -10,3 +10,14 @@
 
 .@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
 .@{fa-css-prefix}-flip-vertical   { .fa-icon-flip(1, -1, 2); }
+
+// Hook for IE8-9
+// -------------------------
+
+:root .@{fa-css-prefix}-rotate-90,
+:root .@{fa-css-prefix}-rotate-180,
+:root .@{fa-css-prefix}-rotate-270,
+:root .@{fa-css-prefix}-flip-horizontal,
+:root .@{fa-css-prefix}-flip-vertical {
+  filter: none;
+}

src/assets/font-awesome/less/spinning.less

@@ -12,16 +12,34 @@
 }
 
 @-moz-keyframes fa-spin {
-  0% { -moz-transform: rotate(0deg); }
-  100% { -moz-transform: rotate(359deg); }
-}
-@-webkit-keyframes fa-spin {
-  0% { -webkit-transform: rotate(0deg); }
-  100% { -webkit-transform: rotate(359deg); }
+  0% {
+    -moz-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -moz-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
 }
 @-o-keyframes fa-spin {
-  0% { -o-transform: rotate(0deg); }
-  100% { -o-transform: rotate(359deg); }
+  0% {
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -o-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
 }
 @keyframes fa-spin {
   0% {

src/assets/font-awesome/scss/_rotated-flipped.scss

@@ -10,3 +10,14 @@
 
 .#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); }
 .#{$fa-css-prefix}-flip-vertical   { @include fa-icon-flip(1, -1, 2); }
+
+// Hook for IE8-9
+// -------------------------
+
+:root .#{$fa-css-prefix}-rotate-90,
+:root .#{$fa-css-prefix}-rotate-180,
+:root .#{$fa-css-prefix}-rotate-270,
+:root .#{$fa-css-prefix}-flip-horizontal,
+:root .#{$fa-css-prefix}-flip-vertical {
+  filter: none;
+}

src/assets/font-awesome/scss/_spinning.scss

@@ -12,16 +12,34 @@
 }
 
 @-moz-keyframes fa-spin {
-  0% { -moz-transform: rotate(0deg); }
-  100% { -moz-transform: rotate(359deg); }
-}
-@-webkit-keyframes fa-spin {
-  0% { -webkit-transform: rotate(0deg); }
-  100% { -webkit-transform: rotate(359deg); }
+  0% {
+    -moz-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -moz-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
 }
 @-o-keyframes fa-spin {
-  0% { -o-transform: rotate(0deg); }
-  100% { -o-transform: rotate(359deg); }
+  0% {
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -o-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
 }
 @keyframes fa-spin {
   0% {

src/assets/js/ZeroClipboard-1.1.7.min.js

@@ -24,8 +24,8 @@ relative_path: ../
   {% include stripe-ad.html %}
 
   {% include community/getting-support.html %}
-  {% include community/reporting-bugs.html %}
   {% include community/requesting-new-icons.html %}
+  {% include community/reporting-bugs.html %}
   {% include community/submitting-pull-requests.html %}
   {% include community/project-milestones.html %}
 

src/get-started.html

@@ -81,13 +81,19 @@ $ gem install font-awesome-less
 {% endhighlight %}
       </li>
     </ol>
+    <p>
+    If you use Rails, add this to your e.g. <code>application.css</code>, just before <code>*= require_self</code>:
+    </p>
+{% highlight css %}
+ *= require font-awesome
+{% endhighlight %}
   </section>
 
   <section id="ruby-gem-sass">
     <h2 class="page-header">EASY: <a href="https://github.com/FortAwesome/font-awesome-sass">SASS Ruby Gem</a></h2>
     <p>
       Use the <a href="https://github.com/FortAwesome/font-awesome-sass">Official Font Awesome SASS Ruby Gem</a> to easily get Font
-      Awesome SASS into a Rails project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>.
+      Awesome SASS into a Rails or Compass project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>.
     </p>
     <ol>
       <li>
@@ -108,6 +114,12 @@ $ gem install font-awesome-sass
 {% endhighlight %}
       </li>
     </ol>
+    <p>
+    If you use Rails, add this to your e.g. <code>application.css</code>, just before <code>*= require_self</code>:
+    </p>
+{% highlight css %}
+ *= require font-awesome
+{% endhighlight %}
   </section>
 
   <section id="custom-less">

src/icons.yml

@@ -3113,7 +3113,8 @@ icons:
     unicode:    f1cd
     created:    4.1
     aliases:
-      - life-bouy
+      - life-bouy # TODO: Deprecated - remove in 5.0.0
+      - life-buoy
       - life-saver
       - support
     categories: