From b2c513c47f4699d048a264821a3bc776770d4213 Mon Sep 17 00:00:00 2001 From: Julien Deswaef Date: Sat, 16 Feb 2019 12:22:18 -0500 Subject: [PATCH] Merge pull request #158 from vanokhin/#140 Change animation names according to fa-css-prefix variable --- less/animated.less | 12 ++++++------ scss/_animated.scss | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/less/animated.less b/less/animated.less index 66ad52a5b..6e4d1c3aa 100644 --- a/less/animated.less +++ b/less/animated.less @@ -2,16 +2,16 @@ // -------------------------- .@{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); @@ -22,7 +22,7 @@ } } -@keyframes fa-spin { +@keyframes ~'@{fa-css-prefix}-spin' { 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); diff --git a/scss/_animated.scss b/scss/_animated.scss index 8a020dbff..543d5b33d 100644 --- a/scss/_animated.scss +++ b/scss/_animated.scss @@ -2,16 +2,16 @@ // -------------------------- .#{$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); @@ -22,7 +22,7 @@ } } -@keyframes fa-spin { +@keyframes #{$fa-css-prefix}-spin { 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg);