fixed merge conflict

zero-to-mastery · Sep 14, 2023 · 39be5b2 · 39be5b2
2 parents c780fb0 + c9e9ff7
commit 39be5b2
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 0 deletions.
diff --git a/Art/ball/bouncing-ball.gif b/Art/ball/bouncing-ball.gif
diff --git a/Art/ball/index.html b/Art/ball/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <link rel="stylesheet" type="text/css" href="./style.css" />
+<title>Ball</title>
+
+</head>
+<body>
+<div class="ball"></div>
+</body>
+</html>
diff --git a/Art/ball/style.css b/Art/ball/style.css
@@ -0,0 +1,35 @@
+body {
+  margin: 0;
+  padding: 0;
+}
+
+.ball {
+  width: 100px;
+  height: 100px;
+  border-radius: 50%;
+  background-color: red;
+  position: absolute;
+  top: 0;
+  left: 0;
+  margin-top: 100px;
+  position: absolute;
+
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+@keyframes bounce {
+  0% {
+    top: 0;
+  }
+  50% {
+    top: 100px;
+  }
+  100% {
+    top: 0;
+  }
+}
+
+.ball {
+  animation: bounce 2s infinite;
+}
diff --git a/include.js b/include.js
@@ -6567,6 +6567,13 @@ let cards = [
     imageLink: './Art/AayushNair/3d/style.css',
     author: 'Aayush',
     githubLink: 'https://github.com/aayushnr'
+  },
+  {
+    artName: 'Bouncing Ball',
+    pageLink: './Art/ball/index.html',
+    imageLink: './Art/ball/bouncing-ball.gif',
+    author: 'Varian1',
+    githubLink: 'https://github.com/varian1'
   }
 ];