From fc081ad1845a5802e773b3426e68488b17777635 Mon Sep 17 00:00:00 2001
From: HauErn Lien <lienhe81@gmail.com>
Date: Tue, 1 Oct 2024 20:48:12 +0000
Subject: [PATCH] Update 3 files
- /wiki/pages/hardware.html
- /wiki/pages/tryhomepage.html
- /wiki/pages/random.html
---
wiki/pages/hardware.html | 4 +--
wiki/pages/random.html | 64 +++++++++----------------------------
wiki/pages/tryhomepage.html | 19 +++++------
3 files changed, 25 insertions(+), 62 deletions(-)
diff --git a/wiki/pages/hardware.html b/wiki/pages/hardware.html
index 7afe26ad..04587b54 100644
--- a/wiki/pages/hardware.html
+++ b/wiki/pages/hardware.html
@@ -94,8 +94,8 @@
<div class="row mt-4">
<div class="col-lg-12">
<h3>Control module</h3>
- <p>To achieve dosage control, we can use an STM32 or Arduino module for power management. The user can control the power output duration by regulating the number of button presses on the control module, which in turn controls the working time of the atomizer and ultimately manages the amount of musk ketone used.</p>
-
+ <p>To achieve dosage control, we can use an STM32 or Arduino module for power management. The user can control the power output duration by regulating the number of button presses on the control module, which in turn controls the working time of the atomizer and ultimately manages the amount of muscone used.</p>
+
</div>
</div>
diff --git a/wiki/pages/random.html b/wiki/pages/random.html
index e318d5fa..00df26f4 100644
--- a/wiki/pages/random.html
+++ b/wiki/pages/random.html
@@ -21,35 +21,16 @@
}
}
- .section {
- height: 100vh; /* Full viewport height */
- display: flex;
- line-height: 1.6;
- margin: 0;
- padding: 0;
- background-image: url('https://static.igem.wiki/teams/5187/ran-1.jpg');
- background-attachment: fixed;
- background-size: cover;
- background-position: 90% center;
- background-repeat: no-repeat;
- justify-content: center;
- align-items: center;
- font-size: 2em;
- transition: background-color 0.5s ease; /* Smooth transition */
- }
- #section1 {
- background-image: url('https://static.igem.wiki/teams/5187/ran-1.jpg');
- background-attachment: fixed;
- background-size: cover;
- background-position: 90% center;
- background-repeat: no-repeat;
- }
- #section2 {
- background-color: lightcoral;
- }
- #section3 {
- background-color: lightgreen;
- }
+ body {
+ line-height: 1.6;
+ margin: 0;
+ padding: 0;
+ background-image: url('https://static.igem.wiki/teams/5187/ran-1.jpg');
+ background-attachment: fixed;
+ background-size: cover;
+ background-position: 90% center;
+ background-repeat: no-repeat;
+ }
.content-wrapper {
display: flex;
@@ -170,14 +151,11 @@
{% include 'menu.html' %}
- <div class="section">Section 1
- <h2>Do you regret not giving your fullest?</h2>
- <p>Everyone gets sick from time to time, often returning to their normal routines within days. But what if you're an IBD patient? Can life ever truly feel normal again? While IBD may not be fatal, it can gradually consume every facet of your existence. With constant hospital visits, unpredictable cramps, and the toll of immune attacks, you find yourself living—but not truly alive.</p>
- </div>
-
- <div class="section" id="section2">Section 2</div>
- <div class="section" id="section3">Section 3</div>
-
+ <div class="content-wrapper">
+ <div id="first-block">
+ <h2>Do you regret not giving your fullest?</h2>
+ <p>Everyone gets sick from time to time, often returning to their normal routines within days. But what if you're an IBD patient? Can life ever truly feel normal again? While IBD may not be fatal, it can gradually consume every facet of your existence. With constant hospital visits, unpredictable cramps, and the toll of immune attacks, you find yourself living—but not truly alive.</p>
+ </div>
<div class="card-container">
<div class="card">
@@ -245,18 +223,6 @@
this.classList.toggle('expanded');
});
});
-
- window.addEventListener('scroll', () => {
- const sections = document.querySelectorAll('.section');
- let scrollPosition = window.scrollY; // Current scroll position
-
- sections.forEach((section) => {
- if (scrollPosition >= section.offsetTop && scrollPosition < section.offsetTop + section.offsetHeight) {
- // Change the body's background color based on the current section
- document.body.style.backgroundColor = getComputedStyle(section).backgroundColor;
- }
- });
- })
</script>
</body>
</html>
\ No newline at end of file
diff --git a/wiki/pages/tryhomepage.html b/wiki/pages/tryhomepage.html
index 8242929e..fcd21a97 100644
--- a/wiki/pages/tryhomepage.html
+++ b/wiki/pages/tryhomepage.html
@@ -15,10 +15,10 @@
padding: 0;
box-sizing: border-box;
.poppins-bold {
- font-family: "Poppins", system-ui;
- font-weight: 700;
- font-style: normal;
- }
+ font-family: "Poppins", system-ui;
+ font-weight: 700;
+ font-style: normal;
+ }
font-optical-sizing: auto;
font-weight: 438;
font-style: normal;
@@ -60,7 +60,7 @@
top: 40%;
left: 15%;
transform: translate(-50%, -50%, -50%);
- color: #161621;
+ color: #161616;
}
.logo{
@@ -132,16 +132,13 @@
intro.classList.add('slide-up');
})
+ setTimeout(()=>{
+ window.location.href = nextPage;
+ }, 1500);
}, 2300)
})
})
-
- window.onscroll = function(ev) {
- if ((window.innerHeight + window.pageYOffset) >= document.body.offsetHeight) {
- window.location.href = nextPage;
- }
- };
</script>
</body>
</html>
--
GitLab