Skip to content

Commit 08a1af8

Browse files
NellowTCSNellowTCS
committed
A quick fix and sonner theming :D
1 parent cfb6934 commit 08a1af8

36 files changed

Lines changed: 112 additions & 76 deletions

‎Build/package-lock.json‎

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Build/package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"private": true,
55
"type": "module",
66
"scripts": {
7-
"dev": "BUILD_TARGET=web vite",
8-
"dev:web": "BUILD_TARGET=web vite",
9-
"dev:desktop": "BUILD_TARGET=desktop tauri dev",
10-
"build": "BUILD_TARGET=web vite build",
11-
"build:web": "BUILD_TARGET=web vite build",
12-
"build:desktop": "BUILD_TARGET=desktop tauri build",
7+
"dev": "cross-env BUILD_TARGET=web vite",
8+
"dev:web": "cross-env BUILD_TARGET=web vite",
9+
"dev:desktop": "cross-env BUILD_TARGET=desktop tauri dev",
10+
"build": "cross-env BUILD_TARGET=web vite build",
11+
"build:web": "cross-env BUILD_TARGET=web vite build",
12+
"build:desktop": "cross-env BUILD_TARGET=desktop tauri build",
1313
"tauri": "tauri",
1414
"start": "cd dist && python3 -m http.server 8000",
1515
"preview": "vite preview",
@@ -74,6 +74,7 @@
7474
"@vite-pwa/assets-generator": "^1.0.0",
7575
"@vitejs/plugin-react": "^5.1.1",
7676
"cloc": "^2.11.0",
77+
"cross-env": "^10.1.0",
7778
"eslint": "^9.36.0",
7879
"eslint-plugin-react": "^7.37.5",
7980
"prettier": "^3.6.2",

‎Build/src/components/Miniplayer.module.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
.controls button:hover {
7777
color: var(--themecolor);
78-
background: var(--themecolor1-transparent);
78+
background: var(--themecolor-transparent);
7979
transform: translateY(-1px);
8080
}
8181

‎Build/src/components/Miniplayer.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export const toggleMiniplayer = async (controls: MiniplayerControls) => {
142142
"--themecolor3",
143143
"--themecolor4",
144144
"--themegradient",
145-
"--themecolor1-transparent",
145+
"--themecolor-transparent",
146146
"--themecolor2-transparent",
147147
"--themecolor3-transparent",
148148
"--foreground",
@@ -390,7 +390,7 @@ export function broadcastThemeCSS() {
390390
"--themecolor3",
391391
"--themecolor4",
392392
"--themegradient",
393-
"--themecolor1-transparent",
393+
"--themecolor-transparent",
394394
"--themecolor2-transparent",
395395
"--themecolor3-transparent",
396396
"--foreground",

‎Build/src/helpers/themeMode.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export function getCurrentThemeCSS(): string {
119119
"--themecolor3",
120120
"--themecolor4",
121121
"--themegradient",
122-
"--themecolor1-transparent",
122+
"--themecolor-transparent",
123123
"--themecolor2-transparent",
124124
"--themecolor3-transparent",
125125
"--foreground",

‎Build/src/pages/main.tsx‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,20 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
7979
<ThemeLoader defaultTheme="Blue">
8080
<WallpaperLoader defaultWallpaper="None">
8181
<LoadingGate>
82-
<Toaster />
82+
<Toaster
83+
theme="system"
84+
position="bottom-right"
85+
toastOptions={{
86+
style: {
87+
background: "linear-gradient(135deg, var(--themecolor-transparent), var(--themecolor2-transparent))",
88+
color: "var(--primary-foreground)",
89+
borderRadius: "var(--radius-md)",
90+
boxShadow: "var(--shadow-md)",
91+
fontFamily: "var(--font-family-base)",
92+
border: "1px solid var(--primary-border)",
93+
},
94+
}}
95+
/>
8396
<IndexPage />
8497
</LoadingGate>
8598
</WallpaperLoader>

‎Build/src/themes/Themes/50Shades/50Shades.theme.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
--themecolor2: hsl(220, 100%, 40%);
5959
--themecolor3: hsl(195, 100%, 65%);
6060
--themecolor4: hsl(220, 80%, 35%);
61-
--themecolor1-transparent: hsla(200, 100%, 60%, 0.5);
61+
--themecolor-transparent: hsla(200, 100%, 60%, 0.5);
6262
--themecolor2-transparent: hsla(220, 100%, 40%, 0.5);
6363
--themecolor3-transparent: hsla(195, 100%, 65%, 0.5);
6464
--menu-background: hsla(220, 100%, 40%, 0.35);
@@ -266,7 +266,7 @@
266266
--themecolor2: hsl(220, 80%, 25%);
267267
--themecolor3: hsl(195, 80%, 40%);
268268
--themecolor4: hsl(220, 70%, 20%);
269-
--themecolor1-transparent: hsla(200, 80%, 35%, 0.5);
269+
--themecolor-transparent: hsla(200, 80%, 35%, 0.5);
270270
--themecolor2-transparent: hsla(220, 80%, 25%, 0.5);
271271
--themecolor3-transparent: hsla(195, 80%, 40%, 0.5);
272272
--menu-background: hsla(220, 80%, 25%, 0.25);

‎Build/src/themes/Themes/Aurora/Aurora.theme.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
--themecolor2: color-mix(in oklab, #0080ff 75%, #000000 25%);
1111
--themecolor3: color-mix(in oklab, #00ffaa 70%, #0066ff 30%);
1212
--themecolor4: color-mix(in oklab, #0099ff 65%, #ff0066 35%);
13-
--themecolor1-transparent: color-mix(in oklab, transparent 50%, #00ff87);
13+
--themecolor-transparent: color-mix(in oklab, transparent 50%, #00ff87);
1414
--themecolor2-transparent: color-mix(in oklab, transparent 50%, #0080ff);
1515
--themecolor3-transparent: color-mix(in oklab, transparent 50%, #00ffaa);
1616
--menu-background: color-mix(in oklab, transparent 65%, #0080ff);
@@ -183,7 +183,7 @@
183183
--themecolor2: color-mix(in oklab, #0066cc 70%, #ffffff 30%);
184184
--themecolor3: color-mix(in oklab, #00cc88 65%, #003366 35%);
185185
--themecolor4: color-mix(in oklab, #0077cc 65%, #cc0044 35%);
186-
--themecolor1-transparent: color-mix(in oklab, transparent 50%, #00cc6a);
186+
--themecolor-transparent: color-mix(in oklab, transparent 50%, #00cc6a);
187187
--themecolor2-transparent: color-mix(in oklab, transparent 50%, #0066cc);
188188
--themecolor3-transparent: color-mix(in oklab, transparent 50%, #00cc88);
189189
--menu-background: color-mix(in oklab, transparent 75%, #0066cc);

‎Build/src/themes/Themes/BlackHole/BlackHole.theme.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
--themecolor2: hsl(0, 0%, 25%);
1414
--themecolor3: hsl(0, 0%, 35%);
1515
--themecolor4: hsl(210, 20%, 40%);
16-
--themecolor1-transparent: hsla(0, 0%, 15%, 0.5);
16+
--themecolor-transparent: hsla(0, 0%, 15%, 0.5);
1717
--themecolor2-transparent: hsla(0, 0%, 25%, 0.5);
1818
--themecolor3-transparent: hsla(0, 0%, 35%, 0.5);
1919
--menu-background: hsla(0, 0%, 25%, 0.35);
@@ -128,7 +128,7 @@
128128
--themecolor2: hsl(225, 50%, 15%);
129129
--themecolor3: hsl(210, 60%, 25%);
130130
--themecolor4: hsl(350, 85%, 60%);
131-
--themecolor1-transparent: hsla(0, 0%, 5%, 0.5);
131+
--themecolor-transparent: hsla(0, 0%, 5%, 0.5);
132132
--themecolor2-transparent: hsla(225, 50%, 15%, 0.5);
133133
--themecolor3-transparent: hsla(210, 60%, 25%, 0.5);
134134
--menu-background: hsla(225, 50%, 15%, 0.25);

‎Build/src/themes/Themes/Blue/Blue.theme.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
--themecolor2: hsl(224, 64%, 33%);
77
--themecolor3: hsl(199, 89%, 48%);
88
--themecolor4: hsl(226, 71%, 40%);
9-
--themecolor1-transparent: hsla(195, 100%, 50%, 0.5);
9+
--themecolor-transparent: hsla(195, 100%, 50%, 0.5);
1010
--themecolor2-transparent: hsla(224, 64%, 33%, 0.5);
1111
--themecolor3-transparent: hsla(199, 89%, 48%, 0.5);
1212
--menu-background: hsla(203, 60%, 45%, 0.575);
@@ -114,7 +114,7 @@
114114
--themecolor2: hsl(216, 33%, 22%);
115115
--themecolor3: hsl(199, 100%, 12%);
116116
--themecolor4: hsl(226, 71%, 25%);
117-
--themecolor1-transparent: hsla(195, 100%, 25%, 0.5);
117+
--themecolor-transparent: hsla(195, 100%, 25%, 0.5);
118118
--themecolor2-transparent: hsla(224, 64%, 20%, 0.5);
119119
--themecolor3-transparent: hsla(199, 89%, 18%, 0.5);
120120
--menu-background: hsla(224, 64%, 33%, 0.25);

0 commit comments

Comments
 (0)