mirror of
https://github.com/ForkAwesome/Fork-Awesome.git
synced 2025-01-13 16:50:29 +08:00
Moving merge changes to source files.
This commit is contained in:
parent
b2c513c47f
commit
c5f5e7d5d3
@ -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);
|
||||||
|
@ -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);
|
||||||
|
13
src/doc/assets/fork-awesome/scss/_functions.scss
Normal file
13
src/doc/assets/fork-awesome/scss/_functions.scss
Normal 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}\"");
|
||||||
|
}
|
@ -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";
|
||||||
|
Loading…
Reference in New Issue
Block a user