Skip to content

Commit d6c66f0

Browse files
authored
Merge pull request #1 from lukehaas/step2
update style for load6
2 parents f8b96e7 + bbd6d67 commit d6c66f0

File tree

2 files changed

+37
-19
lines changed

2 files changed

+37
-19
lines changed

css/load6.css

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111
-webkit-transform: translateZ(0);
1212
-ms-transform: translateZ(0);
1313
transform: translateZ(0);
14-
-webkit-animation: load6 1.7s infinite ease;
15-
animation: load6 1.7s infinite ease;
14+
-webkit-animation: load6 1.7s infinite ease, round 1.7s infinite ease;
15+
animation: load6 1.7s infinite ease, round 1.7s infinite ease;
1616
}
1717
@-webkit-keyframes load6 {
1818
0% {
19-
-webkit-transform: rotate(0deg);
20-
transform: rotate(0deg);
2119
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
2220
}
2321
5%,
@@ -35,15 +33,11 @@
3533
box-shadow: 0 -0.83em 0 -0.4em, -0.377em -0.74em 0 -0.42em, -0.645em -0.522em 0 -0.44em, -0.775em -0.297em 0 -0.46em, -0.82em -0.09em 0 -0.477em;
3634
}
3735
100% {
38-
-webkit-transform: rotate(360deg);
39-
transform: rotate(360deg);
4036
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
4137
}
4238
}
4339
@keyframes load6 {
4440
0% {
45-
-webkit-transform: rotate(0deg);
46-
transform: rotate(0deg);
4741
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
4842
}
4943
5%,
@@ -60,9 +54,27 @@
6054
38% {
6155
box-shadow: 0 -0.83em 0 -0.4em, -0.377em -0.74em 0 -0.42em, -0.645em -0.522em 0 -0.44em, -0.775em -0.297em 0 -0.46em, -0.82em -0.09em 0 -0.477em;
6256
}
57+
100% {
58+
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
59+
}
60+
}
61+
@-webkit-keyframes round {
62+
0% {
63+
-webkit-transform: rotate(0deg);
64+
transform: rotate(0deg);
65+
}
66+
100% {
67+
-webkit-transform: rotate(360deg);
68+
transform: rotate(360deg);
69+
}
70+
}
71+
@keyframes round {
72+
0% {
73+
-webkit-transform: rotate(0deg);
74+
transform: rotate(0deg);
75+
}
6376
100% {
6477
-webkit-transform: rotate(360deg);
6578
transform: rotate(360deg);
66-
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
6779
}
6880
}

less/load6.less

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,37 @@
1515
-webkit-transform: translateZ(0);
1616
-ms-transform: translateZ(0);
1717
transform: translateZ(0);
18-
-webkit-animation:load6 1.7s infinite ease;
19-
animation:load6 1.7s infinite ease;
18+
-webkit-animation:load6 1.7s infinite ease, round 1.7s infinite ease;
19+
animation:load6 1.7s infinite ease, round 1.7s infinite ease;;
2020
}
2121

2222
}
2323
@-webkit-keyframes load6 {.load6-frames;}
2424
@keyframes load6 {.load6-frames;}
2525

26-
.load6-frames() {
26+
@-webkit-keyframes round {.round;}
27+
@keyframes round {.round;}
28+
29+
.round() {
30+
0% {
31+
-webkit-transform:rotate(0deg);
32+
transform:rotate(0deg);
33+
}
34+
100% {
35+
-webkit-transform:rotate(360deg);
36+
transform:rotate(360deg);
37+
}
38+
}
2739

40+
.load6-frames() {
2841
0% {
29-
-webkit-transform:rotate(0deg);
30-
transform:rotate(0deg);
3142
box-shadow:
3243
0 -0.83em 0 -0.4em,
3344
0 -0.83em 0 -0.42em,
3445
0 -0.83em 0 -0.44em,
3546
0 -0.83em 0 -0.46em,
3647
0 -0.83em 0 -0.477em;
3748
}
38-
3949
5%,
4050
95% {
4151
box-shadow:
@@ -73,16 +83,12 @@
7383
-0.775em -0.297em 0 -0.46em,
7484
-0.82em -0.09em 0 -0.477em;
7585
}
76-
7786
100% {
78-
-webkit-transform:rotate(360deg);
79-
transform:rotate(360deg);
8087
box-shadow:
8188
0 -0.83em 0 -0.4em,
8289
0 -0.83em 0 -0.42em,
8390
0 -0.83em 0 -0.44em,
8491
0 -0.83em 0 -0.46em,
8592
0 -0.83em 0 -0.477em;
8693
}
87-
8894
}

0 commit comments

Comments
 (0)