Skip to content

Commit 079a228

Browse files
authored
Merge branch 'master' into yogesh
2 parents 599a5ad + 9c67f32 commit 079a228

19 files changed

+871
-854
lines changed

Allfiles/Mod12/Democode/KeyframeAnimations.html

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
top: 0px;
3434
}
3535

36-
@-ms-keyframes ballmovement {
36+
@keyframes ballmovement {
3737

3838
0% {
3939
left: 0px;
4040
top: 0px;
4141
background-color: yellow;
42-
-ms-animation-timing-function: ease-in;
42+
animation-timing-function: ease-in;
4343
}
4444

4545
33% {
@@ -58,17 +58,17 @@
5858
left: 300px;
5959
top: 160px;
6060
background-color: purple;
61-
-ms-animation-timing-function: ease-out;
61+
animation-timing-function: ease-out;
6262
}
6363
}
6464

6565
#ball.animate {
66-
-ms-animation-name: ballmovement;
67-
-ms-animation-duration: 10s;
68-
-ms-animation-delay: 3s;
69-
-ms-animation-timing-function: linear;
70-
-ms-animation-iteration-count: 2;
71-
-ms-animation-direction: alternate;
66+
animation-name: ballmovement;
67+
animation-duration: 10s;
68+
animation-delay: 3s;
69+
animation-timing-function: linear;
70+
animation-iteration-count: 2;
71+
animation-direction: alternate;
7272
}
7373

7474
</style>
@@ -129,4 +129,3 @@
129129
<div id="messageLabel"></div>
130130
</body>
131131
</html>
132-

Instructions/20480C_MOD05_LAB_MANUAL.md

Lines changed: 62 additions & 65 deletions
Large diffs are not rendered by default.

Instructions/20480C_MOD06_DEMO.md

Lines changed: 70 additions & 68 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)