Updated Oct 28 2023

jerrylovescheese · Oct 28, 2023 · 6d1d9c0 · 6d1d9c0
1 parent 11af95e
commit 6d1d9c0
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 41 deletions.
diff --git a/index.html b/index.html
@@ -13,9 +13,6 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+SC:wght@400;700&display=swap" rel="stylesheet">
-    <link
-        href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap"
-        rel="stylesheet">
     <link rel="stylesheet" href="./static/css/index.css">
 
 </head>
@@ -28,13 +25,9 @@
 
     <div class="whatsapp" id="whatsapp-1">
         <div id="inner">
-            <span id="header">Baby we're the new romantics. <br></span>
-            <div id="remainTime"><i>1989 (Taylor's Version)</i> will be out in
-                <div id="one" style="display: inline;"></div> days
-                <div id="two" style="display: inline;"></div> hours
-                <div id="three" style="display: inline;"></div> minutes
-                <div id="four" style="display: inline;"></div> seconds.
-            </div>
+            <span id="header">And yes, we're back to 1989 (Taylor's Version). <br></span>
+            <span id="alt-text"><a href="./pages/subpages/1989tv.html">歌词本正在更新，欢迎围观 <i
+                        class="fas fa-arrow-right"></i></a></span>
         </div>
     </div>
     <br>
@@ -252,7 +245,7 @@
     <div class="normal-container">
         <br>
         <div class="marquee">
-            <p>热烈庆祝《Cruel Summer》登上公告牌单曲榜榜首及《Anti-Hero》上榜一周年！
+            <p>《1989 (Taylor's Version)》闪亮登场！
             </p>
         </div>
         <div class="warning"><span style="font-weight: bold; color: #825900;"><i
@@ -358,33 +351,6 @@
             href="http://jerrylovescheese.github.io/web/pages/aluminum_studio.html">江源工作室</a></p>
     <br><br><br><br>
     <script type="text/javascript">
-        // When the user scrolls down 50px from the top of the document, resize the header's font size
-        // window.onscroll = function () { scrollFunction() };
-
-        // function scrollFunction() {
-        //     if (document.body.scrollTop > 50 || document.documentElement.scrollTop > 50) {
-        //         document.getElementById("whatsapp-1").style.height = "fit-content";
-        //         document.getElementById("header").style.fontSize = "20px";
-        //         document.getElementById("inner").style.padding = "20px";
-        //         document.getElementById("whatsapp-1").style.boxShadow = "0px 5px 10px darkblue";
-        //         document.getElementById("whatsapp-1").style.backgroundImage = "linear-gradient(9deg, rgba(255, 255, 255), rgb(255, 255, 255))";
-        //         document.getElementById("header").style.color = "black";
-        //         document.getElementById("remainTime").style.color = "black";
-        //         document.getElementById("remainTime").style.fontSize = "20px";
-        //         document.getElementById("whatsapp-1").style.aspectRatio = "unset";
-        //     } else {
-        //         document.getElementById("whatsapp-1").style.height = "auto";
-        //         document.getElementById("header").style.fontSize = "30px";
-        //         document.getElementById("inner").style.padding = "20px";
-        //         document.getElementById("whatsapp-1").style.boxShadow = "none";
-        //         document.getElementById("whatsapp-1").style.backgroundImage = "url(./static/img/td-po.webp)";
-        //         document.getElementById("header").style.color = "white";
-        //         document.getElementById("remainTime").style.color = "white";
-        //         document.getElementById("remainTime").style.fontSize = "25px";
-        //         document.getElementById("whatsapp-1").style.aspectRatio = "16/9";
-        //     }
-        // }
-
         function time() {
             var vWeek, vWeek_s, vDay;
             vWeek = ["Sun. 日", "Mon. 一", "Tue. 二", "Wed. 三", "Thu. 四", "Fri. 五", "Sat. 六"];

diff --git a/static/css/index.css b/static/css/index.css
@@ -428,16 +428,16 @@ td {
     background-color: #adadad7f;
 }
 
-#remainTime {
+#alt-text {
     display: inline;
-    font-family: 'Montserrat', sans-serif;
+    font-family: 'Noto Serif SC', serif;
     font-weight: normal;
     font-size: 25px;
     position: relative;
 }
 
 #header {
-    font-family: 'Montserrat', sans-serif;
+    font-family: 'Noto Serif SC', serif;
     font-weight: bold;
     font-size: 30px;
     transition: all 0.4s cubic-bezier(0.075, 0.82, 0.165, 1);

diff --git a/utilities/countdownkit.html b/utilities/countdownkit.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+
+<body>
+    <div id="remainTime">
+        <div id="one" style="display: inline;"></div> days
+        <div id="two" style="display: inline;"></div> hours
+        <div id="three" style="display: inline;"></div> minutes
+        <div id="four" style="display: inline;"></div> seconds.
+    </div>
+</body>
+
+</html>
diff --git a/utilities/scrollview.js b/utilities/scrollview.js
@@ -0,0 +1,26 @@
+// When the user scrolls down 50px from the top of the document, resize the header's font size
+window.onscroll = function () { scrollFunction() };
+
+function scrollFunction() {
+    if (document.body.scrollTop > 50 || document.documentElement.scrollTop > 50) {
+        document.getElementById("whatsapp-1").style.height = "fit-content";
+        document.getElementById("header").style.fontSize = "20px";
+        document.getElementById("inner").style.padding = "20px";
+        document.getElementById("whatsapp-1").style.boxShadow = "0px 5px 10px darkblue";
+        document.getElementById("whatsapp-1").style.backgroundImage = "linear-gradient(9deg, rgba(255, 255, 255), rgb(255, 255, 255))";
+        document.getElementById("header").style.color = "black";
+        document.getElementById("remainTime").style.color = "black";
+        document.getElementById("remainTime").style.fontSize = "20px";
+        document.getElementById("whatsapp-1").style.aspectRatio = "unset";
+    } else {
+        document.getElementById("whatsapp-1").style.height = "auto";
+        document.getElementById("header").style.fontSize = "30px";
+        document.getElementById("inner").style.padding = "20px";
+        document.getElementById("whatsapp-1").style.boxShadow = "none";
+        document.getElementById("whatsapp-1").style.backgroundImage = "url(./static/img/td-po.webp)";
+        document.getElementById("header").style.color = "white";
+        document.getElementById("remainTime").style.color = "white";
+        document.getElementById("remainTime").style.fontSize = "25px";
+        document.getElementById("whatsapp-1").style.aspectRatio = "16/9";
+    }
+}