From 007941fedaca9b8b287fba69c93cd1961979e027 Mon Sep 17 00:00:00 2001
From: Arzumify <jliwin98@hectabit.org>
Date: Thu, 16 May 2024 17:58:11 +0100
Subject: [PATCH] Merge all the css files into one, unifying styles

---
 static/css/dashboard.css | 132 ---------------------------------------
 static/css/style.css     | 104 ++++++++++++++++++++++++------
 templates/acct.html      |   2 +-
 templates/dashboard.html |   2 +-
 4 files changed, 87 insertions(+), 153 deletions(-)
 delete mode 100644 static/css/dashboard.css

diff --git a/static/css/dashboard.css b/static/css/dashboard.css
deleted file mode 100644
index 3c2c2c2..0000000
--- a/static/css/dashboard.css
+++ /dev/null
@@ -1,132 +0,0 @@
-@import url("/static/fonts/inter.css");
-
-body {
-  margin: 0;
-  font-family: "Inter", sans-serif;
-  text-align: center;
-  overflow-wrap: anywhere;
-  --theme-color: #157efb;
-  --border-color: #dadada;
-  --editor: #ffffff;
-  --bar: #f4f4f4;
-  color: #000000;
-}
-
-@media (prefers-color-scheme: dark) {
-  body {
-    --border-color: #393b3d;
-    --bar: #2d2f31;
-    --editor: #202124;
-    color: #ffffff;
-  }
-}
-
-.hidden {
-  display: none;
-}
-
-.iframe {
-  position: fixed;
-  right: 0;
-  top: 38px;
-  border: none;
-  height: 276px;
-  width: 400px;
-  transform: translateX(26px);
-}
-
-.acctbutton {
-  position: fixed;
-  right: 0;
-  margin: 0;
-}
-
-.spacer {
-  margin-top: 30px;
-}
-
-.credit {
-  position: fixed;
-  left: 5px;
-  color: white;
-  z-index: -1;
-  margin: 0;
-  bottom: 5px;
-  text-shadow: black 1px 1px 5px;
-}
-
-.background {
-  position: fixed;
-  z-index: -2;
-  top: 0;
-  left: 0;
-  width: 100%;
-  min-height: 100%;
-}
-
-.newoauth, .oauthlist, .oauthentry {
-  width: calc(100% - 17.5vh);
-  margin-top: 7vh;
-  margin-left: 7vh;
-  margin-right: 7vh;
-  padding: 15px 10px 30px;
-  border-style: solid;
-  border-image: none;
-  border-radius: 8px;
-  border-width: 1px;
-  font-size: 17px;
-  background-color: var(--bar);
-  border-color: var(--border-color);
-}
-
-.oauthentry {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  padding: 5px;
-}
-
-.oauthentry button {
-  padding: 10px;
-  background-color: red;
-  color: white
-}
-
-.oauthentry button:hover {
-  background-color: black;
-}
-
-button {
-  background-color: var(--theme-color);
-  color: white;
-  padding: 10px;
-  margin-right: 5px;
-  border: none;
-  border-radius: 8px;
-  font-size: 14px;
-}
-
-button:hover {
-  background-color: #152efb;
-  transition: all 0.3s ease 0s;
-}
-
-h2 {
-  display: block;
-  margin-top: 20px;
-  font-weight: 300;
-}
-
-input {
-    width: calc(100% - 120px);
-    height: 30px;
-    margin-bottom: 10px;
-    padding-left: 10px;
-    padding-right: 10px;
-
-    border: solid;
-    border-color: var(--border-color);
-    border-width: 1px;
-    border-radius: 8px;
-    background-color: var(--editor);
-}
diff --git a/static/css/style.css b/static/css/style.css
index ea9ee01..223a9dc 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -24,7 +24,7 @@
 
 @media (prefers-color-scheme: dark) {
     :root {
-	--invertdm: 100%;
+        --invertdm: 100%;
         --contrast: #2d2f21;
         --contrast2: #2d2f21;
         --bar: #2d2f31;
@@ -69,15 +69,6 @@ h6 {
     white-space: break-spaces;
 }
 
-h7 {
-    display: block;
-    font-size: 20px;
-    margin-top: 0.67em;
-    margin-bottom: 0.67em;
-    margin-left: 0;
-    margin-right: 0;
-}
-
 body {
     margin: 0;
     background-color: var(--editor);
@@ -123,6 +114,90 @@ body {
 
 }
 
+.iframe {
+    position: fixed;
+    right: 0;
+    top: 38px;
+    border: none;
+    height: 276px;
+    width: 400px;
+    transform: translateX(26px);
+}
+
+.acctbutton {
+    position: fixed;
+    right: 0;
+    margin: 0;
+}
+
+.spacer {
+    margin-top: 30px;
+}
+
+.credit {
+    position: fixed;
+    left: 5px;
+    color: white;
+    z-index: -1;
+    margin: 0;
+    bottom: 5px;
+    text-shadow: black 1px 1px 5px;
+}
+
+.newoauth, .oauthlist, .oauthentry {
+    text-align: center;
+    width: calc(100% - 17.5vh);
+    margin-top: 7vh;
+    margin-left: 7vh;
+    margin-right: 7vh;
+    padding: 15px 10px 30px;
+    border-style: solid;
+    border-image: none;
+    border-radius: 8px;
+    border-width: 1px;
+    font-size: 17px;
+    background-color: var(--bar);
+    border-color: var(--border-color);
+}
+
+.oauthentry {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    padding: 5px;
+}
+
+.oauthentry button {
+    padding: 10px;
+    background-color: red;
+    color: white
+}
+
+.oauthentry button:hover {
+    background-color: black;
+}
+
+button {
+    background-color: var(--theme-color);
+    color: white;
+    padding: 10px;
+    margin-right: 5px;
+    border: none;
+    border-radius: 8px;
+    font-size: 14px;
+}
+
+button:hover {
+    background-color: #152efb;
+    transition: all 0.3s ease 0s;
+}
+
+h2 {
+    display: block;
+    margin-top: 20px;
+    font-weight: 300;
+}
+
 .inoutdiv a {
     color: grey;
     text-align: center;
@@ -136,15 +211,6 @@ body {
     min-height: 100%;
 }
 
-.credit {
-    position: fixed;
-    left: 5px;
-    color: white;
-    z-index: -1;
-    margin: 0;
-    bottom: 5px;
-}
-
 .hidden {
     display: none !important;
 }
diff --git a/templates/acct.html b/templates/acct.html
index f6a04e4..7d17af3 100644
--- a/templates/acct.html
+++ b/templates/acct.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en"><head>
-        <link rel="stylesheet" href="/static/css/dashboard.css" media="">
+        <link rel="stylesheet" href="/static/css/style.css" media="">
         <script src="/static/js/dashboard.js"></script>
         <title>Dashboard</title>
     </head>
diff --git a/templates/dashboard.html b/templates/dashboard.html
index 0aa935f..0347820 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <link rel="stylesheet" href="/static/css/dashboard.css" media="">
+        <link rel="stylesheet" href="/static/css/style.css" media="">
         <script src="/static/js/dashboard.js"></script>
         <title>Dashboard</title>
     </head>