From fbf7dee0f065d04be82e292322c25bd838d0c1eb Mon Sep 17 00:00:00 2001
From: Giac <giac@sludge.link>
Date: Tue, 9 Dec 2025 08:21:52 -0600
Subject: [PATCH] Fixed merge

---
 src/lib/styles/cyberpunk.css | 98 +++++++++++++++++-------------------
 src/lib/styles/vaporwave.css | 28 ++++-------
 2 files changed, 58 insertions(+), 68 deletions(-)

diff --git a/src/lib/styles/cyberpunk.css b/src/lib/styles/cyberpunk.css
index d28a9bd..1980c83 100644
--- a/src/lib/styles/cyberpunk.css
+++ b/src/lib/styles/cyberpunk.css
@@ -1,52 +1,48 @@
-/* Cyberpunk Theme */
-:global{
-  body:has(.theme-cyberpunk){
-    background: #0a0e27;
-  }
-  .theme-cyberpunk {
-    font-family: 'Courier New', monospace;
-    background: #0a0e27;
-    color: #00ffff;
-    .dice-display {
-      background: rgba(0, 255, 255, 0.05);
-      border: 1px solid #00ffff;
-    }
-    .window{
-      background: rgba(10, 14, 39, 0.95);
-      border: 2px solid #00ffff;
-      box-shadow: 0 0 20px #ff00ff;
-    }
-    .title-bar {
-      background: linear-gradient(90deg, #ff00ff, #00ffff);
-      color: #000;
-      padding: 12px;
-      font-weight: bold;
-      text-transform: uppercase;
-    }
-    fieldset {
-      border: 1px solid #ff00ff;
-    }
-
-    legend {
-      color: #ff00ff;
-      text-transform: uppercase;
-    }
-
-    button {
-      background: transparent;
-      border: 2px solid #ff00ff;
-      color: #ff00ff;
-      font-family: 'Courier New', monospace;
-      text-transform: uppercase;
-      padding: 10px 25px;
-      &:hover {
-        background: #ff00ff;
-        color: #000;
-      }
-    }
-    .chart-display {
-      background: rgba(0, 255, 255, 0.05);
-      border: 1px solid #00ffff;
-    }
-  }
+.theme-cyberpunk {
+  font-family: 'Courier New', monospace;
+  background: #0a0e27;
+  color: #00ffff;
 }
+
+.theme-cyberpunk .window {
+  background: rgba(10, 14, 39, 0.95);
+  border: 2px solid #00ffff;
+  box-shadow: 0 0 20px #ff00ff;
+}
+
+.theme-cyberpunk .title-bar {
+  background: linear-gradient(90deg, #ff00ff, #00ffff);
+  color: #000;
+  padding: 12px;
+  font-weight: bold;
+  text-transform: uppercase;
+}
+
+.theme-cyberpunk fieldset {
+  border: 1px solid #ff00ff;
+}
+
+.theme-cyberpunk legend {
+  color: #ff00ff;
+  text-transform: uppercase;
+}
+
+.theme-cyberpunk button {
+  background: transparent;
+  border: 2px solid #ff00ff;
+  color: #ff00ff;
+  font-family: 'Courier New', monospace;
+  text-transform: uppercase;
+  padding: 10px 25px;
+}
+
+.theme-cyberpunk button:hover {
+  background: #ff00ff;
+  color: #000;
+}
+
+.theme-cyberpunk .chart-display,
+.theme-cyberpunk .dice-display {
+  background: rgba(0, 255, 255, 0.05);
+  border: 1px solid #00ffff;
+}
\ No newline at end of file
diff --git a/src/lib/styles/vaporwave.css b/src/lib/styles/vaporwave.css
index 38db50d..f165c81 100644
--- a/src/lib/styles/vaporwave.css
+++ b/src/lib/styles/vaporwave.css
@@ -1,18 +1,17 @@
-/* Vaporwave Theme */
-:global(.theme-vaporwave) {
+.theme-vaporwave {
   font-family: 'Arial', sans-serif;
   background: linear-gradient(180deg, #ff6ad5 0%, #c774e8 50%, #ad8cff 100%);
   color: #fff;
 }
 
-:global(.theme-vaporwave .window) {
+.theme-vaporwave .window {
   background: rgba(255, 106, 213, 0.3);
   backdrop-filter: blur(10px);
   border: 3px solid #00f0ff;
   box-shadow: 0 8px 32px rgba(0, 240, 255, 0.4);
 }
 
-:global(.theme-vaporwave .title-bar) {
+.theme-vaporwave .title-bar {
   background: linear-gradient(90deg, #ff6ad5, #00f0ff);
   color: #fff;
   padding: 15px;
@@ -22,31 +21,26 @@
   text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
 }
 
-:global(.theme-vaporwave fieldset) {
+.theme-vaporwave fieldset {
   border: 2px solid #00f0ff;
   background: rgba(255, 255, 255, 0.1);
 }
 
-:global(.theme-vaporwave legend) {
+.theme-vaporwave legend {
   color: #00f0ff;
   text-transform: uppercase;
 }
 
-:global(.theme-vaporwave button) {
+.theme-vaporwave button {
   background: linear-gradient(135deg, #ff6ad5, #c774e8);
   border: 2px solid #00f0ff;
   color: #fff;
   text-transform: uppercase;
   padding: 12px 30px;
 }
-	:global(.theme-vaporwave .chart-display ){
-		background: rgba(255, 255, 255, 0.15);
-		border: 2px solid #ff6ad5;
-	}
-:global{
-  .theme-vaporwave .dice-display {
-    background: rgba(255, 255, 255, 0.15);
-    border: 2px solid #ff6ad5;
-  }
-}
 
+.theme-vaporwave .chart-display,
+.theme-vaporwave .dice-display {
+  background: rgba(255, 255, 255, 0.15);
+  border: 2px solid #ff6ad5;
+}
\ No newline at end of file