merge conflicts

css/font-awesome.css

@@ -77,30 +77,8 @@
 }
 .fa-spin {
   -webkit-animation: fa-spin 2s infinite linear;
-  -moz-animation: fa-spin 2s infinite linear;
-  -o-animation: fa-spin 2s infinite linear;
   animation: fa-spin 2s infinite linear;
 }
-@-moz-keyframes fa-spin {
-  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);
-    transform: rotate(0deg);
-  }
-  100% {
-    -o-transform: rotate(359deg);
-    transform: rotate(359deg);
-  }
-}
 @-webkit-keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);
@@ -124,41 +102,31 @@
 .fa-rotate-90 {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
   -webkit-transform: rotate(90deg);
-  -moz-transform: rotate(90deg);
   -ms-transform: rotate(90deg);
-  -o-transform: rotate(90deg);
   transform: rotate(90deg);
 }
 .fa-rotate-180 {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
   -webkit-transform: rotate(180deg);
-  -moz-transform: rotate(180deg);
   -ms-transform: rotate(180deg);
-  -o-transform: rotate(180deg);
   transform: rotate(180deg);
 }
 .fa-rotate-270 {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
   -webkit-transform: rotate(270deg);
-  -moz-transform: rotate(270deg);
   -ms-transform: rotate(270deg);
-  -o-transform: rotate(270deg);
   transform: rotate(270deg);
 }
 .fa-flip-horizontal {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
   -webkit-transform: scale(-1, 1);
-  -moz-transform: scale(-1, 1);
   -ms-transform: scale(-1, 1);
-  -o-transform: scale(-1, 1);
   transform: scale(-1, 1);
 }
 .fa-flip-vertical {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
   -webkit-transform: scale(1, -1);
-  -moz-transform: scale(1, -1);
   -ms-transform: scale(1, -1);
-  -o-transform: scale(1, -1);
   transform: scale(1, -1);
 }
 :root .fa-rotate-90,

less/mixins.less

@@ -4,17 +4,13 @@
 .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);
 }
 
 .fa-icon-flip(@horiz, @vert, @rotation) {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1);
   -webkit-transform: scale(@horiz, @vert);
-     -moz-transform: scale(@horiz, @vert);
       -ms-transform: scale(@horiz, @vert);
-       -o-transform: scale(@horiz, @vert);
           transform: scale(@horiz, @vert);
 }

less/spinning.less

@@ -3,31 +3,9 @@
 
 .@{fa-css-prefix}-spin {
   -webkit-animation: fa-spin 2s infinite linear;
-  -moz-animation: fa-spin 2s infinite linear;
-  -o-animation: fa-spin 2s infinite linear;
           animation: fa-spin 2s infinite linear;
 }
 
-@-moz-keyframes fa-spin {
-  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);
-    transform: rotate(0deg);
-  }
-  100% {
-    -o-transform: rotate(359deg);
-    transform: rotate(359deg);
-  }
-}
 @-webkit-keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);
@@ -38,6 +16,7 @@
             transform: rotate(359deg);
   }
 }
+
 @keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);

scss/_mixins.scss

@@ -4,17 +4,13 @@
 @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);
 }

scss/_spinning.scss

@@ -3,31 +3,9 @@
 
 .#{$fa-css-prefix}-spin {
   -webkit-animation: fa-spin 2s infinite linear;
-  -moz-animation: fa-spin 2s infinite linear;
-  -o-animation: fa-spin 2s infinite linear;
           animation: fa-spin 2s infinite linear;
 }
 
-@-moz-keyframes fa-spin {
-  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);
-    transform: rotate(0deg);
-  }
-  100% {
-    -o-transform: rotate(359deg);
-    transform: rotate(359deg);
-  }
-}
 @-webkit-keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);
@@ -38,6 +16,7 @@
             transform: rotate(359deg);
   }
 }
+
 @keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);

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

@@ -6,17 +6,13 @@
 .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);
 }
 
 .fa-icon-flip(@horiz, @vert, @rotation) {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1);
   -webkit-transform: scale(@horiz, @vert);
-     -moz-transform: scale(@horiz, @vert);
       -ms-transform: scale(@horiz, @vert);
-       -o-transform: scale(@horiz, @vert);
           transform: scale(@horiz, @vert);
 }

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

@@ -6,31 +6,9 @@
 
 .@{fa-css-prefix}-spin {
   -webkit-animation: fa-spin 2s infinite linear;
-  -moz-animation: fa-spin 2s infinite linear;
-  -o-animation: fa-spin 2s infinite linear;
           animation: fa-spin 2s infinite linear;
 }
 
-@-moz-keyframes fa-spin {
-  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);
-    transform: rotate(0deg);
-  }
-  100% {
-    -o-transform: rotate(359deg);
-    transform: rotate(359deg);
-  }
-}
 @-webkit-keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);
@@ -41,6 +19,7 @@
             transform: rotate(359deg);
   }
 }
+
 @keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);

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

@@ -6,17 +6,13 @@
 @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);
 }

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

@@ -6,31 +6,9 @@
 
 .#{$fa-css-prefix}-spin {
   -webkit-animation: fa-spin 2s infinite linear;
-  -moz-animation: fa-spin 2s infinite linear;
-  -o-animation: fa-spin 2s infinite linear;
           animation: fa-spin 2s infinite linear;
 }
 
-@-moz-keyframes fa-spin {
-  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);
-    transform: rotate(0deg);
-  }
-  100% {
-    -o-transform: rotate(359deg);
-    transform: rotate(359deg);
-  }
-}
 @-webkit-keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);
@@ -41,6 +19,7 @@
             transform: rotate(359deg);
   }
 }
+
 @keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);