From 4858ea91d6566351f6a8df5a70a9c3350560d87b Mon Sep 17 00:00:00 2001
From: Shraddha <ShraddhaRaghuram@student.tudelft.nl>
Date: Mon, 30 Sep 2024 10:47:46 +0200
Subject: [PATCH] change position of steps in roadmap

---
 static/{homepage.js => homepage-roadmap.js} |  0
 static/homepage.css                         | 53 +++++++++++++++++++++
 wiki/pages/home.html                        |  2 +-
 3 files changed, 54 insertions(+), 1 deletion(-)
 rename static/{homepage.js => homepage-roadmap.js} (100%)

diff --git a/static/homepage.js b/static/homepage-roadmap.js
similarity index 100%
rename from static/homepage.js
rename to static/homepage-roadmap.js
diff --git a/static/homepage.css b/static/homepage.css
index da0f4f7..91ab2d8 100644
--- a/static/homepage.css
+++ b/static/homepage.css
@@ -602,6 +602,7 @@
 
 /* bottom links style */
 .homepage-link1 {
+<<<<<<< HEAD
   top: 11000px;
   transform: translateX(-410px);
   width: 400px;
@@ -609,6 +610,15 @@
   flex-shrink: 0;
   opacity: 0;
   transition: all 0.5s linear;
+=======
+    top: 11900px;
+    transform: translateX(-410px);
+    width: 400px;
+    height: 500px;
+    flex-shrink: 0;
+    opacity: 0;
+    transition: all 0.5s linear;
+>>>>>>> fb92959 (change position of steps in roadmap)
 }
 .homepage-link-img1 {
   margin: 0 auto;
@@ -637,6 +647,7 @@
 }
 
 .homepage-link2 {
+<<<<<<< HEAD
   top: 11800px;
   width: 400px;
   height: 500px;
@@ -644,6 +655,15 @@
   opacity: 0;
   transition: all 0.5s linear;
   transform: translateX(410px);
+=======
+    top: 12500px;
+    width: 400px;
+    height: 500px;
+    flex-shrink: 0;
+    opacity: 0;
+    transition: all 0.5s linear;
+    transform: translateX(410px);
+>>>>>>> fb92959 (change position of steps in roadmap)
 }
 
 .homepage-link-img2 {
@@ -659,6 +679,7 @@
 }
 
 .homepage-link3 {
+<<<<<<< HEAD
   top: 12600px;
   transform: translateX(-410px);
   width: 400px;
@@ -666,6 +687,15 @@
   flex-shrink: 0;
   opacity: 0;
   transition: all 0.5s linear;
+=======
+    top: 13100px;
+    transform: translateX(-410px);
+    width: 400px;
+    height: 500px;
+    flex-shrink: 0;
+    opacity: 0;
+    transition: all 0.5s linear;
+>>>>>>> fb92959 (change position of steps in roadmap)
 }
 .homepage-link1 > a {
   text-decoration: none;
@@ -683,6 +713,7 @@
   text-decoration: none;
 }
 
+<<<<<<< HEAD
 .homepage-link-img3 {
   margin: 0 auto;
   width: 400px;
@@ -702,6 +733,28 @@
   flex-shrink: 0;
   opacity: 0;
   transition: all 0.5s linear;
+=======
+
+.homepage-link-img3{
+    margin: 0 auto;
+    width: 400px;
+    height: 300px;
+    background: url("https://static.igem.wiki/teams/5054/cell-division.png");
+    background-repeat: no-repeat;
+    background-size: 91%;
+    background-position: center;
+    transition: all 0.1s linear;
+    transform: translateX(30px);
+} 
+.homepage-link4 {
+    top: 13700px;
+    transform: translateX(410px);
+    width: 400px;
+    height: 500px;
+    flex-shrink: 0;
+    opacity: 0;
+    transition: all 0.5s linear;
+>>>>>>> fb92959 (change position of steps in roadmap)
 }
 
 .homepage-link-img4 {
diff --git a/wiki/pages/home.html b/wiki/pages/home.html
index 2eb0148..3830dee 100644
--- a/wiki/pages/home.html
+++ b/wiki/pages/home.html
@@ -346,7 +346,7 @@
 
 <canvas id="roadmap" width="1300" height="3000" style="background-color: transparent;"></canvas>
 </div>
-<script src="{{ url_for('static', filename = 'homepage.js') }}" type="text/javascript"></script>
+<script src="{{ url_for('static', filename = 'homepage-roadmap.js') }}" type="text/javascript"></script>
 
 <script src="{{ url_for('static', filename = 'homepage-animation.js') }}" type="text/javascript"></script>
 
-- 
GitLab