resolved merge conflict

zero-to-mastery · Oct 2, 2023 · 463be3c · 463be3c
2 parents 4679a06 + 2afcaff
commit 463be3c
Show file tree

Hide file tree

Showing 4 changed files with 134 additions and 2 deletions.
diff --git a/Art/Adithya/index.html b/Art/Adithya/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Circular Waves</title>
+    <link rel="stylesheet" href="./styles.css" />
+  </head>
+  <body class="bg">
+    <div class="circle1">
+      <span class="place"></span>
+      <span class="border-animation ba1"></span>
+      <span class="border-animation ba2"></span>
+      <span class="border-animation ba3"></span>
+    </div>
+    <div class="circle2">
+      <span class="place2"></span>
+      <span class="border-animation ba11"></span>
+      <span class="border-animation ba22"></span>
+      <span class="border-animation ba33"></span>
+    </div>
+  </body>
+</html>
diff --git a/Art/Adithya/result.gif b/Art/Adithya/result.gif
diff --git a/Art/Adithya/styles.css b/Art/Adithya/styles.css
@@ -0,0 +1,102 @@
+.bg {
+  background-color: #1b1b1b;
+}
+.circle1 {
+  width: 100px;
+  height: 100px;
+  border-radius: 100%;
+  position: absolute;
+  top: 50%;
+  left: 40%;
+  -webkit-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+}
+.circle2 {
+  width: 100px;
+  height: 100px;
+  border-radius: 100%;
+  position: absolute;
+  top: 50%;
+  right: 40%;
+  -webkit-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+}
+.place {
+  background: #ea4335;
+  z-index: 2;
+}
+.place2 {
+  background: #35ea71;
+  z-index: 2;
+}
+.circle1 .border-animation,
+.place {
+  display: block;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  border-radius: 100%;
+}
+
+.circle2 .border-animation,
+.place2 {
+  display: block;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  border-radius: 100%;
+}
+.circle1 .border-animation {
+  z-index: 1;
+}
+.circle2 .border-animation {
+  z-index: 1;
+}
+.ba1 {
+  animation: rounder1 2s linear 2s infinite alternate;
+  background: rgba(238, 76, 63, 0.6);
+}
+.ba11 {
+  animation: rounder1 2s linear 2s infinite alternate;
+  background: rgba(63, 238, 148, 0.6);
+}
+@keyframes rounder1 {
+  from {
+    transform: scale(1);
+  }
+  to {
+    transform: scale(1.39);
+  }
+}
+.ba2 {
+  animation: rounder2 2s linear 2s infinite alternate;
+  background: rgba(245, 85, 71, 0.5);
+}
+.ba22 {
+  animation: rounder2 2s linear 2s infinite alternate;
+  background: rgba(71, 245, 120, 0.5);
+}
+@keyframes rounder2 {
+  from {
+    transform: scale(1);
+  }
+  to {
+    transform: scale(1.69);
+  }
+}
+.ba3 {
+  animation: rounder3 2s linear 2s infinite alternate;
+  background: rgba(251, 97, 84, 0.4);
+}
+.ba33 {
+  animation: rounder3 2s linear 2s infinite alternate;
+  background: rgba(84, 251, 109, 0.4);
+}
+@keyframes rounder3 {
+  from {
+    transform: scale(1);
+  }
+  to {
+    transform: scale(1.99);
+  }
+}
diff --git a/include.js b/include.js
@@ -113,10 +113,17 @@ let cards = [
   },
   {
     artName: 'Sun shadow',
-    pageLink: './Art/Guruprasad-Kulkarni/index.html',
-    imageLink: './Art/Guruprasad-Kulkarni/sun.gif',
+    pageLink: './Art/Guruprasad Kulkarni/index.html',
+    imageLink: './Art/Guruprasad Kulkarni/sun.gif',
     author: 'Guruprasad',
     githubLink: 'https://github.com/Guruprasad846'
+  },
+  {
+    artName: 'Circle',
+    pageLink: './Art/Adithya/index.html',
+    imageLink: './Art/Adithya/result.gif',
+    author: 'Adithya',
+    githubLink: 'https://github.com/Adithya-K-Shetty'
   }
 ];