pushing 4.2.0

1 files changed, 9 insertions, 4 deletions

diff --git a/assets/font-awesome/scss/_mixins.scss b/assets/font-awesome/scss/_mixins.scss
index 3354e6953..a139dfb30 100644
--- a/assets/font-awesome/scss/_mixins.scss
+++ b/assets/font-awesome/scss/_mixins.scss
@@ -1,20 +1,25 @@
 // Mixins
 // --------------------------
 
+@mixin fa-icon() {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
 @mixin fa-icon-rotate($degrees, $rotation) {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
   -webkit-transform: rotate($degrees);
-     -moz-transform: rotate($degrees);
       -ms-transform: rotate($degrees);
-       -o-transform: rotate($degrees);
           transform: rotate($degrees);
 }
 
 @mixin fa-icon-flip($horiz, $vert, $rotation) {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
   -webkit-transform: scale($horiz, $vert);
-     -moz-transform: scale($horiz, $vert);
       -ms-transform: scale($horiz, $vert);
-       -o-transform: scale($horiz, $vert);
           transform: scale($horiz, $vert);
 }