Merge remote-tracking branch 'refs/remotes/origin/main'

aidenhuynh · Nov 2, 2023 · 6df4296 · 6df4296
2 parents 8c924a5 + 38d0559
commit 6df4296
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 38 deletions.
diff --git a/assets/header/script.js b/assets/header/script.js
@@ -26,7 +26,6 @@ function updateHeader(email) {
   headerRight.innerHTML = `
       <a href="/">Home</a>
       <a href="/stats/">Statistics</a>
-      <a href="/About">About</a>
       <span>${email}</span>
       <a href="javascript:signOut()">Sign Out</a>
   `;
@@ -38,7 +37,6 @@ function updateHeaderSignUp() {
       <a href="/">Home</a>
       <a href="/stats/">Statistics</a>
       <a href="/search">Search</a>
-      <a href="/About">About</a>
       <a href="/sign_in">Sign Up</a>
   `;
 }

diff --git a/assets/search/search.css b/assets/search/search.css
@@ -2,6 +2,9 @@
     height: 5em;
     width: auto;
 }
+body{
+    background-color: #191414;
+}
 table {
     table-layout: fixed;
     width: 100%;
@@ -84,14 +87,28 @@ table {
 .input-group input {
     width: 100%;
     padding: 10px;
-    border: 1px solid #df1111;
     border-radius: 25px;
     font-size: 20px;
     margin-bottom: 10px;
     text-align: center;
 }
-.button-elements{
-    color: rgb(83, 30, 83);
-    border-radius: 0px;
-    size: 20px;
-}
+
+.button-elements {
+
+  }
+
+.button-elements button {
+    margin: auto;
+    display: block;
+    background-color: #924bee;
+    color: #fff;
+    border: none;
+    border-radius: 25px;
+    padding: 10px 20px;
+    cursor: pointer;
+    font-size: 18px;
+    margin-bottom: 20px;
+}    
+.button-elements button:hover {
+    background-color: #df7bda;
+}   
diff --git a/search.html b/search.html
@@ -3,35 +3,41 @@
 search_exclude: true
 ---
 
-<div>
-  <div class="input-group">
-    <input type="text" id="filterInput" placeholder="Enter">
-    <div class="button-elements">
-      <button id="search">Search</button>
+<style>
+
+</style>
+
+<body>
+  <div style="margin-top: 4%;">
+    <div class="input-group">
+      <input type="text" id="filterInput" placeholder="Enter">
+      <div class="button-elements">
+        <button id="search">Search</button>
+      </div>
     </div>
+      <link
+        href="https://fonts.googleapis.com/css?family=Rock+Salt"
+        rel="stylesheet"
+        type="text/css"/>
+      <link rel="stylesheet" type="text/css" href="/assets/search/search.css">
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.1.4/sockjs.min.js"></script>
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js"></script>
+      <script src="/assets/search/search.js" type="module">
+      </script>
   </div>
-    <link
-      href="https://fonts.googleapis.com/css?family=Rock+Salt"
-      rel="stylesheet"
-      type="text/css"/>
-    <link rel="stylesheet" type="text/css" href="/assets/search/search.css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.1.4/sockjs.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js"></script>
-    <script src="/assets/search/search.js" type="module">
-    </script>
-</div>
-  <table>
-    <thead>
-      <tr>
-        <div class="metadata">
-          <th>Artist</th>
-          <th>Track</th>
-          <th>Album Cover</th>
-          <th>Preview</th>
-          <th>Play Song</th>
-        </div>
-      </tr>
-    </thead>
-    <tbody id="result">
-    </tbody>
-  </table>
+    <table>
+      <thead>
+        <tr>
+          <div class="metadata">
+            <th>Artist</th>
+            <th>Track</th>
+            <th>Album Cover</th>
+            <th>Preview</th>
+            <th>Play Song</th>
+          </div>
+        </tr>
+      </thead>
+      <tbody id="result">
+      </tbody>
+    </table>
+</body>