Moving merge changes to source files.

This commit is contained in:
Julien Deswaef 2019-02-16 12:40:54 -05:00
parent b2c513c47f
commit c5f5e7d5d3
4 changed files with 26 additions and 14 deletions

View file

@ -1,20 +1,19 @@
--- ---
--- ---
// Animated Icons // Animated Icons
// -------------------------- // --------------------------
.@{fa-css-prefix}-spin { .@{fa-css-prefix}-spin {
-webkit-animation: fa-spin 2s infinite linear; -webkit-animation: ~'@{fa-css-prefix}-spin' 2s infinite linear;
animation: fa-spin 2s infinite linear; animation: ~'@{fa-css-prefix}-spin' 2s infinite linear;
} }
.@{fa-css-prefix}-pulse { .@{fa-css-prefix}-pulse {
-webkit-animation: fa-spin 1s infinite steps(8); -webkit-animation: ~'@{fa-css-prefix}-spin' 1s infinite steps(8);
animation: fa-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% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
@ -25,7 +24,7 @@
} }
} }
@keyframes fa-spin { @keyframes ~'@{fa-css-prefix}-spin' {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);

View file

@ -1,20 +1,19 @@
--- ---
--- ---
// Spinning Icons // Spinning Icons
// -------------------------- // --------------------------
.#{$fa-css-prefix}-spin { .#{$fa-css-prefix}-spin {
-webkit-animation: fa-spin 2s infinite linear; -webkit-animation: #{$fa-css-prefix}-spin 2s infinite linear;
animation: fa-spin 2s infinite linear; animation: #{$fa-css-prefix}-spin 2s infinite linear;
} }
.#{$fa-css-prefix}-pulse { .#{$fa-css-prefix}-pulse {
-webkit-animation: fa-spin 1s infinite steps(8); -webkit-animation: #{$fa-css-prefix}-spin 1s infinite steps(8);
animation: fa-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% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
@ -25,7 +24,7 @@
} }
} }
@keyframes fa-spin { @keyframes #{$fa-css-prefix}-spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);

View file

@ -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}\"");
}

View file

@ -4,6 +4,7 @@
@import "variables"; @import "variables";
@import "mixins"; @import "mixins";
@import "functions";
@import "path"; @import "path";
@import "core"; @import "core";
@import "larger"; @import "larger";