Merge pull request #368 from jerrylovescheese/jerrysbranch

Updated Nov 15 2024
jerrylovescheese · Nov 15, 2024 · fe96644 · fe96644
2 parents 926e0f7 + 56253dd
commit fe96644
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 17 deletions.
diff --git a/pages/music.html b/pages/music.html
@@ -36,6 +36,10 @@
             td {
                 border-bottom-color: white !important;
             }
+
+            #music-image-1 {
+                border-color: #333;
+            }
         }
 
         #dev-cal-1 {
@@ -66,20 +70,16 @@
             z-index: -1;
         }
 
-        .pages-container {
-            color: white;
-        }
-
         table#dev-cal-2 {
-            border-top: solid 1px rgb(255, 255, 255);
-            border-bottom: solid 1px rgb(255, 255, 255);
+            border-top: solid 1px black;
+            border-bottom: solid 1px black;
             width: 100%;
             overflow: scroll;
         }
 
         table#dev-cal-2 th,
         td {
-            border-bottom: solid 1px rgb(255, 255, 255);
+            border-bottom: solid 1px black;
             padding: 5px;
             padding-right: 30px;
         }
@@ -135,9 +135,9 @@
             fill: rgb(178, 192, 192);
         }
 
-        #music-emp {
+        /* #music-emp {
             color: rgb(183, 222, 222);
-        }
+        } */
 
         #music-clicker {
             position: absolute;
@@ -148,6 +148,23 @@
                 0 4px 4px rgba(0, 0, 0, 0.11),
                 0 8px 8px rgba(0, 0, 0, 0.11);
         }
+
+        #music-image-c{
+            width: 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 30px;
+        }
+
+        #music-image-1 {
+            width: 300px;
+            background-image: url(../static/img/IMG_8106.jpg);
+            background-size: contain;
+            aspect-ratio: 1179/1852;
+            border-radius: 10px;
+            border: solid 1px #eee;
+        }
     </style>
 </head>
 
@@ -158,7 +175,7 @@
     </div>
 
     <div id="content-unit">
-        <div id="music-light"></div>
+        <!-- <div id="music-light"></div>
         <div id="music-lyric-dis">
             <div id="music-lyrics">
                 <div class="music-lyric" id="music-lyric-1">
@@ -259,6 +276,9 @@
                 666 with a princess streak
                 I'm everywhere, I'm so Julia
             </div>
+        </div> -->
+        <div id="music-image-c">
+            <div id="music-image-1"></div>
         </div>
         <div class="pages-container">
             <p id="dev-cal-2">Page contains a log of the songs I'm currently listening to</p>

diff --git a/static/css/style.css b/static/css/style.css
@@ -232,7 +232,6 @@ body {
 #header-unit {
     position: fixed;
     left: 130px;
-    right: 0px;
     top: 10px;
     width: auto;
     margin-left: 10px;
@@ -255,7 +254,7 @@ body {
 }
 
 .header {
-    width: 100%;
+    width: fit-content;
     height: 24px;
     font-weight: bold;
     font-size: 15px;
@@ -265,7 +264,7 @@ body {
 
 #quick-links {
     height: 50px;
-    width: calc(100vw - 150px);
+    width: fit-content;
     margin-left: 0;
     margin-right: 0;
     border-right: none;
@@ -286,13 +285,14 @@ body {
 
 .quick-link {
     display: inline;
-    border-radius: 20px;
-    padding: 5px;
+    height: 30px;
+    display: flex;
     padding-left: 10px;
     padding-right: 10px;
-    border: solid 1px gray;
+    justify-content: center;
+    align-items: center;
+    border-left: solid 1px #ddd;
     transition: all 0.3s;
-    margin-right: 5px;
     font-size: 15px;
 }
 
@@ -534,6 +534,10 @@ nav {
         border: solid 1px #444 !important;
     }
 
+    .quick-link {
+        border-left-color: #555;
+    }
+
     #quick-links>b {
         color: rgba(255, 255, 255, 0.5) !important;
     }

diff --git a/static/img/IMG_8106.jpg b/static/img/IMG_8106.jpg