Skip to content

Commit 6559204

Browse files
Merge pull request #325 from filmstarr/master
Adjust asd animation to fix second half of flip animation on iOS devi…
2 parents c7a5334 + d9ab089 commit 6559204

File tree

3 files changed

+7
-34
lines changed

3 files changed

+7
-34
lines changed

compiled/flipclock.css

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@
173173
.flip-clock-wrapper .flip { box-shadow: 0 2px 5px rgba(0, 0, 0, 0.7); }
174174

175175
.flip-clock-wrapper ul.play li.flip-clock-active {
176-
-webkit-animation: asd 0.5s 0.5s linear both;
177-
-moz-animation: asd 0.5s 0.5s linear both;
178-
animation: asd 0.5s 0.5s linear both;
176+
-webkit-animation: asd 0.01s 0.49s linear both;
177+
-moz-animation: asd 0.01s 0.49s linear both;
178+
animation: asd 0.01s 0.49s linear both;
179179
z-index: 5; }
180180

181181
.flip-clock-divider {
@@ -221,39 +221,27 @@
221221
0% {
222222
z-index: 2; }
223223

224-
20% {
225-
z-index: 4; }
226-
227224
100% {
228225
z-index: 4; } }
229226

230227
@-moz-keyframes asd {
231228
0% {
232229
z-index: 2; }
233230

234-
20% {
235-
z-index: 4; }
236-
237231
100% {
238232
z-index: 4; } }
239233

240234
@-o-keyframes asd {
241235
0% {
242236
z-index: 2; }
243237

244-
20% {
245-
z-index: 4; }
246-
247238
100% {
248239
z-index: 4; } }
249240

250241
@keyframes asd {
251242
0% {
252243
z-index: 2; }
253244

254-
20% {
255-
z-index: 4; }
256-
257245
100% {
258246
z-index: 4; } }
259247

src/flipclock/css/flipclock.css

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@
173173
.flip-clock-wrapper .flip { box-shadow: 0 2px 5px rgba(0, 0, 0, 0.7); }
174174

175175
.flip-clock-wrapper ul.play li.flip-clock-active {
176-
-webkit-animation: asd 0.5s 0.5s linear both;
177-
-moz-animation: asd 0.5s 0.5s linear both;
178-
animation: asd 0.5s 0.5s linear both;
176+
-webkit-animation: asd 0.01s 0.49s linear both;
177+
-moz-animation: asd 0.01s 0.49s linear both;
178+
animation: asd 0.01s 0.49s linear both;
179179
z-index: 5; }
180180

181181
.flip-clock-divider {
@@ -221,39 +221,27 @@
221221
0% {
222222
z-index: 2; }
223223

224-
20% {
225-
z-index: 4; }
226-
227224
100% {
228225
z-index: 4; } }
229226

230227
@-moz-keyframes asd {
231228
0% {
232229
z-index: 2; }
233230

234-
20% {
235-
z-index: 4; }
236-
237231
100% {
238232
z-index: 4; } }
239233

240234
@-o-keyframes asd {
241235
0% {
242236
z-index: 2; }
243237

244-
20% {
245-
z-index: 4; }
246-
247238
100% {
248239
z-index: 4; } }
249240

250241
@keyframes asd {
251242
0% {
252243
z-index: 2; }
253244

254-
20% {
255-
z-index: 4; }
256-
257245
100% {
258246
z-index: 4; } }
259247

src/flipclock/css/flipclock.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
}
168168

169169
.flip-clock-wrapper ul.play li.flip-clock-active {
170-
@include animation(asd .5s .5s linear both);
170+
@include animation(asd .01s .49s linear both);
171171
z-index: 2;
172172
}
173173

@@ -214,9 +214,6 @@
214214
0% {
215215
z-index:2;
216216
}
217-
20% {
218-
z-index:4;
219-
}
220217
100% {
221218
z-index:4;
222219
}

0 commit comments

Comments
 (0)