Moving merge changes to source files.

4 files changed, 26 insertions, 14 deletions

diff --git a/src/doc/assets/fork-awesome/less/animated.less b/src/doc/assets/fork-awesome/less/animated.less
index e489ea318..63e8e3c5b 100644
--- a/src/doc/assets/fork-awesome/less/animated.less
+++ b/src/doc/assets/fork-awesome/less/animated.less
@@ -1,20 +1,19 @@
 ---
 ---
-
 // Animated Icons
 // --------------------------
 
 .@{fa-css-prefix}-spin {
-  -webkit-animation: fa-spin 2s infinite linear;
-          animation: fa-spin 2s infinite linear;
+  -webkit-animation: ~'@{fa-css-prefix}-spin' 2s infinite linear;
+          animation: ~'@{fa-css-prefix}-spin' 2s infinite linear;
 }
 
 .@{fa-css-prefix}-pulse {
-  -webkit-animation: fa-spin 1s infinite steps(8);
-          animation: fa-spin 1s infinite steps(8);
+  -webkit-animation: ~'@{fa-css-prefix}-spin' 1s infinite steps(8);
+          animation: ~'@{fa-css-prefix}-spin' 1s infinite steps(8);
 }
 
-@-webkit-keyframes fa-spin {
+@-webkit-keyframes ~'@{fa-css-prefix}-spin' {
   0% {
     -webkit-transform: rotate(0deg);
             transform: rotate(0deg);
@@ -25,7 +24,7 @@
   }
 }
 
-@keyframes fa-spin {
+@keyframes ~'@{fa-css-prefix}-spin' {
   0% {
     -webkit-transform: rotate(0deg);
             transform: rotate(0deg);
diff --git a/src/doc/assets/fork-awesome/scss/_animated.scss b/src/doc/assets/fork-awesome/scss/_animated.scss
index fed5a987f..b37f0f3cd 100644
--- a/src/doc/assets/fork-awesome/scss/_animated.scss
+++ b/src/doc/assets/fork-awesome/scss/_animated.scss
@@ -1,20 +1,19 @@
 ---
 ---
-
 // Spinning Icons
 // --------------------------
 
 .#{$fa-css-prefix}-spin {
-  -webkit-animation: fa-spin 2s infinite linear;
-          animation: fa-spin 2s infinite linear;
+  -webkit-animation: #{$fa-css-prefix}-spin 2s infinite linear;
+          animation: #{$fa-css-prefix}-spin 2s infinite linear;
 }
 
 .#{$fa-css-prefix}-pulse {
-  -webkit-animation: fa-spin 1s infinite steps(8);
-          animation: fa-spin 1s infinite steps(8);
+  -webkit-animation: #{$fa-css-prefix}-spin 1s infinite steps(8);
+          animation: #{$fa-css-prefix}-spin 1s infinite steps(8);
 }
 
-@-webkit-keyframes fa-spin {
+@-webkit-keyframes #{$fa-css-prefix}-spin {
   0% {
     -webkit-transform: rotate(0deg);
             transform: rotate(0deg);
@@ -25,7 +24,7 @@
   }
 }
 
-@keyframes fa-spin {
+@keyframes #{$fa-css-prefix}-spin {
   0% {
     -webkit-transform: rotate(0deg);
             transform: rotate(0deg);
diff --git a/src/doc/assets/fork-awesome/scss/_functions.scss b/src/doc/assets/fork-awesome/scss/_functions.scss
new file mode 100644
index 000000000..321509162
--- /dev/null
+++ b/src/doc/assets/fork-awesome/scss/_functions.scss
@@ -0,0 +1,13 @@
+---
+---
+// Functions
+// --------------------------
+
+// Helper function which adds quotes to preserve unicode values in CSS output.
+//
+// See: https://github.com/sass/sass/issues/1395
+// See: https://stackoverflow.com/questions/30421570/sass-unicode-escape-is-not-preserved-in-css-file
+
+@function fa-content($fa-var) {
+  @return unquote("\"#{$fa-var}\"");
+}
diff --git a/src/doc/assets/fork-awesome/scss/fork-awesome.scss.txt b/src/doc/assets/fork-awesome/scss/fork-awesome.scss.txt
index f7b78ecd1..effcf2f6b 100644
--- a/src/doc/assets/fork-awesome/scss/fork-awesome.scss.txt
+++ b/src/doc/assets/fork-awesome/scss/fork-awesome.scss.txt
@@ -4,6 +4,7 @@
 
 @import "variables";
 @import "mixins";
+@import "functions";
 @import "path";
 @import "core";
 @import "larger";