resolved merge conflicts

zero-to-mastery · Aug 9, 2023 · a349913 · a349913
2 parents 9fa3c99 + 871d362
commit a349913
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 0 deletions.
diff --git a/Art/erickelninoSwift/erickBallCricus.gif b/Art/erickelninoSwift/erickBallCricus.gif
diff --git a/Art/erickelninoSwift/index.html b/Art/erickelninoSwift/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Eriik Animation</title>
+    <link rel="stylesheet" href="./style.css" />
+  </head>
+  <body>
+    <h1>Erick Elnino Tshimbombo</h1>
+    <div class="box"></div>
+  </body>
+</html>
diff --git a/Art/erickelninoSwift/style.css b/Art/erickelninoSwift/style.css
@@ -0,0 +1,56 @@
+* {
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
+}
+
+body {
+  background-color: black;
+}
+h1 {
+  color: white;
+}
+
+.box {
+  height: 100px;
+  width: 100px;
+  background-color: orangered;
+  position: relative;
+  animation-name: anim;
+  animation-duration: 8s;
+  animation-iteration-count: infinite;
+  border-radius: 50px;
+  border-style: outset;
+  border-color: black;
+}
+
+@keyframes anim {
+  0% {
+    top: 0;
+    left: 0;
+    background-color: orangered;
+  }
+
+  25% {
+    top: 0;
+    left: 500px;
+    background-color: green;
+  }
+  50% {
+    top: 500px;
+    left: 500px;
+    background-color: purple;
+  }
+
+  75% {
+    top: 500px;
+
+    left: 0;
+    background-color: yellow;
+  }
+  100% {
+    top: 0;
+    right: 0;
+    background-color: rgb(31, 182, 220);
+  }
+}
diff --git a/include.js b/include.js
@@ -93,6 +93,20 @@ let cards = [
     author: 'Mike',
     githubLink: 'https://github.com/Mednalig'
   },
+  {
+    artName: 'Dragon Balls Radar',
+    pageLink: './Art/nekimuntu/index.html',
+    imageLink: './Art/nekimuntu/RadarDragonBalls.gif',
+    author: 'Carolyn Nagau aka Nekimuntu',
+    githubLink: 'https://github.com/nekimuntu'
+  },
+  {
+    artName: 'Dragon Balls Radar',
+    pageLink: './Art/nekimuntu/index.html',
+    imageLink: './Art/nekimuntu/RadarDragonBalls.gif',
+    author: 'Carolyn Nagau aka Nekimuntu',
+    githubLink: 'https://github.com/nekimuntu'
+  },
   {
     artName: 'Spooky',
     pageLink: './Art/spooky/index.html',
@@ -9395,6 +9409,13 @@ let cards = [
     imageLink: './Art/rainbow-circle/traunce.gif',
     author: 'Chandni',
     githubLink: 'https://github.com/Chandni-1399'
+  },
+  {
+    artName: 'erickelninoSwift',
+    pageLink: './Art/erickelninoSwift/index.html',
+    imageLink: './Art/erickelninoSwift/erickBallCricus.gif',
+    author: 'Erick El nino Tshimbombo',
+    githubLink: 'https://github.com/erickelninoSwift'
   }
 ];