fixed merge conflict

zero-to-mastery · Oct 2, 2023 · f5906ce · f5906ce
2 parents 2d0ae98 + 63facdd
commit f5906ce
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 0 deletions.
diff --git a/Art/Joy/olga_min/animation.gif b/Art/Joy/olga_min/animation.gif
diff --git a/Art/Joy/olga_min/index.html b/Art/Joy/olga_min/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="stylesheet" href="style.css" />
+    <title>Simple Animation</title>
+  </head>
+  <body>
+    <div class="animated-box"></div>
+  </body>
+</html>
diff --git a/Art/Joy/olga_min/style.css b/Art/Joy/olga_min/style.css
@@ -0,0 +1,27 @@
+body {
+  margin: 0;
+  padding: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+  overflow: hidden;
+}
+
+.animated-box {
+  width: 100px;
+  height: 100px;
+  background-color: #3498db;
+  position: absolute;
+  left: -110px;
+  animation: moveBox 2s linear forwards;
+}
+
+@keyframes moveBox {
+  0% {
+    left: -110px;
+  }
+  100% {
+    left: 100vw;
+  }
+}
diff --git a/include.js b/include.js
@@ -82,6 +82,13 @@ let cards = [
     imageLink: './Art/alexsatalan/shaking.gif',
     author: 'AlexS',
     githubLink: 'https://github.com/alexsatalan'
+  },
+  {
+    artName: 'olga_min',
+    pageLink: './Art/olga_min/index.html',
+    imageLink: './Art/olga_min/animation.gif',
+    author: 'Olga',
+    githubLink: 'https://github.com/OlgaMinaievaWebDev'
   }
 ];