resolved merge conflict

zero-to-mastery · Oct 3, 2023 · c792135 · c792135
2 parents e1e8a83 + 946ef7b
commit c792135
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 0 deletions.
diff --git a/Art/KrishayNair/circle.gif b/Art/KrishayNair/circle.gif
diff --git a/Art/KrishayNair/rectangle.css b/Art/KrishayNair/rectangle.css
@@ -0,0 +1,60 @@
+.rect1 {
+  animation-name: rectangle-animation;
+  animation-duration: 2s;
+  animation-direction: alternate;
+  animation-iteration-count: infinite;
+  animation-timing-function: linear;
+
+  width: 300px;
+  height: 100px;
+  border-radius: 10px;
+  position: absolute;
+  left: 0;
+  right: 0;
+  margin-left: auto;
+  margin-right: auto;
+}
+.rect2 {
+  animation-name: rectangle-animation2;
+  animation-duration: 2s;
+  animation-direction: alternate;
+  animation-iteration-count: infinite;
+  animation-timing-function: linear;
+
+  width: 300px;
+  height: 100px;
+  border-radius: 10px;
+  position: absolute;
+  left: 0;
+  right: 0;
+  margin-left: auto;
+  margin-right: auto;
+}
+body {
+  background-image: url('./circle.gif');
+  background-size: cover;
+}
+@keyframes rectangle-animation {
+  from {
+    background-color: #191ba9;
+    width: 300px;
+    top: 400px;
+  }
+  to {
+    background-color: #5cc2f2;
+    width: 50px;
+    top: 600px;
+  }
+}
+@keyframes rectangle-animation2 {
+  from {
+    background-color: #5cc2f2;
+    width: 50px;
+    top: 110px;
+  }
+  to {
+    background-color: #191ba9;
+    width: 300px;
+    top: 200px;
+  }
+}
diff --git a/Art/KrishayNair/rectangle.html b/Art/KrishayNair/rectangle.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+  <head>
+    <meta charset="utf-8" />
+    <title>A rectangle</title>
+    <link href="./rectangle.css" rel="stylesheet" />
+  </head>
+  <body>
+    <div class="rect1"></div>
+    <div class="rect2"></div>
+  </body>
+</html>
diff --git a/include.js b/include.js
@@ -159,6 +159,13 @@ let cards = [
     imageLink: './Art/ChrRepou/flower.gif',
     author: 'ChrRepou',
     githubLink: 'https://github.com/ChrRepou'
+  },
+  {
+    artName: 'Triangle',
+    pageLink: './Art/KrishayNair/rectangle.html',
+    imageLink: './Art/KrishayNair/circle.gif',
+    author: 'KrishayNair',
+    githubLink: 'https://github.com/KrishayNair'
   }
 ];