resolved merge conflicts

zero-to-mastery · Aug 9, 2023 · 7c3a711 · 7c3a711
2 parents 8ca4665 + 4fa93c9
commit 7c3a711
Show file tree

Hide file tree

Showing 4 changed files with 6,159 additions and 193 deletions.
diff --git a/Art/rainbow-circle/index.html b/Art/rainbow-circle/index.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Animation</title>
+    <link rel="stylesheet" href="style.css">
+</head>
+
+<body>
+    <h1>Rainbow Circle</h1>
+    <div class="carrot"></div>
+</body>
+
+</html>
diff --git a/Art/rainbow-circle/style.css b/Art/rainbow-circle/style.css
@@ -0,0 +1,44 @@
+.carrot {
+    width: 30px;
+    height: 20px;
+    background: red;
+    border-radius: 40%;
+    position: relative;
+    animation-name: loony;
+    animation-duration: 4s;
+    animation-delay: 2s;
+}
+
+@keyframes loony {
+    0% {
+        background-color: red;
+        left: 0px;
+        top: 0px;
+    }
+    25% {
+        background-color: yellow;
+        left: 100px;
+        top: 0px;
+    }
+    50% {
+        background-color: greenyellow;
+        left: 100px;
+        top: 100px;
+    }
+    75% {
+        background-color: rgb(10, 210, 232);
+        left: 0px;
+        top: 100px;
+    }
+    100% {
+        background-color: rgb(245, 35, 245);
+        left: 0px;
+        top: 0px;
+    }
+}
+
+h1 {
+    font-family: cursive;
+    font-size: large;
+    color: mediumspringgreen;
+}
diff --git a/Art/rainbow-circle/traunce.gif b/Art/rainbow-circle/traunce.gif