Skip to content

Commit 00cfc3c

Browse files
TorwentTorwent
committed
fix: more wasp theme tweaks
1 parent c6f0a41 commit 00cfc3c

File tree

10 files changed

+27
-32
lines changed

10 files changed

+27
-32
lines changed

‎src/lib/components/NewScriptCard.svelte‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<span class="font-semibold whitespace-break-spaces text-primary-600 dark:text-primary-500">
3030
{script.title}
3131
</span>
32-
<span class="text-xs text-primary-600 drop-shadow dark:text-secondary-500">
32+
<span class="text-xs text-primary-700-300 drop-shadow">
3333
by
34-
<a href="/scripters/{encodeSEO(username.normalize('NFKC'))}" class="hover:preset-tonal-secondary">
34+
<a href="/scripters/{encodeSEO(username.normalize('NFKC'))}" class="anchor">
3535
{username}
3636
</a>
3737
{#if !script.published}<small class="text-error-500">Unpublished</small>{/if}

‎src/lib/components/ScriptCard.svelte‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,9 @@
3838
<span class="font-semibold whitespace-break-spaces text-primary-600 dark:text-primary-500">
3939
{script.title}
4040
</span>
41-
<span class="text-xs text-primary-600 drop-shadow dark:text-secondary-500">
41+
<span class="text-xs text-primary-700-300 drop-shadow">
4242
by
43-
<a
44-
href="/scripters/{encodeSEO(script.protected.username.replaceAll(' ', '-'))}"
45-
class="hover:preset-tonal-secondary"
46-
>
43+
<a href="/scripters/{encodeSEO(script.protected.username.replaceAll(' ', '-'))}" class="anchor">
4744
{script.protected.username}
4845
</a>
4946
{#if !script.published}<small class="text-error-500">Unpublished</small>{/if}

‎src/routes/Navigation.svelte‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@
7070
{:else}
7171
<Menu class="mx-2 my-auto text-surface-900-100" />
7272
{/if}
73-
<Logo selected={true} />
73+
<Logo selected={false} />
7474
</button>
7575

7676
<ul class="my-auto hidden w-9/12 justify-evenly lg:flex lg:text-xs xl:w-7/12 xl:text-base">
7777
<li class="h-12">
7878
<a
7979
href="/"
8080
class="flex h-full place-content-center place-items-center hover:text-primary-700-300"
81-
class:text-primary-700={"Home" === currentPage}
81+
class:text-primary-800={"Home" === currentPage}
8282
class:dark:text-primary-500={"Home" === currentPage}
8383
aria-label="Navigate to home page"
8484
>
@@ -91,7 +91,7 @@
9191
<a
9292
href={getLink(route)}
9393
class="flex h-full place-content-center place-items-center hover:text-primary-700-300"
94-
class:text-primary-700={route === currentPage}
94+
class:text-primary-800={route === currentPage}
9595
class:dark:text-primary-500={route === currentPage}
9696
aria-label="Navigate to {route.toLowerCase()} page"
9797
>
@@ -147,9 +147,9 @@
147147
<li class="h-12">
148148
<a
149149
href={getLink(route)}
150-
class="flex h-full place-content-center place-items-center hover:text-primary-400 dark:hover:text-primary-100"
151-
class:text-primary-500={route === currentPage}
152-
class:dark:text-primary-400={route === currentPage}
150+
class="flex h-full place-content-center place-items-center hover:text-primary-700-300"
151+
class:text-primary-800={route === currentPage}
152+
class:dark:text-primary-500={route === currentPage}
153153
aria-label="Navigate to {route.toLowerCase()} page"
154154
onclick={() => (showMenu = !showMenu)}
155155
>
@@ -185,7 +185,7 @@
185185

186186
<a
187187
href="/user/{profile.id}"
188-
class="mx-auto my-2 btn flex preset-filled-secondary-500"
188+
class="mx-auto my-2 btn flex preset-filled-primary-500"
189189
aria-label="Open profile page"
190190
onclick={() => (showProfile = false)}
191191
>
@@ -196,7 +196,7 @@
196196
{#if profile.role == "administrator"}
197197
<a
198198
href="/auth"
199-
class="mx-auto btn flex preset-filled-secondary-500"
199+
class="mx-auto btn flex preset-filled-primary-500"
200200
aria-label="Login as a different user"
201201
onclick={() => (showProfile = false)}
202202
>
@@ -217,7 +217,7 @@
217217
<button
218218
name="Logout"
219219
aria-label="Logout"
220-
class="mx-auto btn preset-filled-secondary-500"
220+
class="mx-auto btn preset-filled-primary-500"
221221
formaction="/auth?/logout"
222222
>
223223
<LogOut />
@@ -251,7 +251,7 @@
251251
</nav>
252252
<a
253253
href="https://waspscripts.com"
254-
class="bg-surface-300-700/70 py-2 text-center backdrop-blur-lg hover:text-secondary-900-100"
254+
class="bg-surface-300-700/70 py-2 text-center backdrop-blur-lg hover:text-primary-900-100"
255255
>
256256
This website is for <b>Simba 2000</b>. Click here to visit the legacy version of the website.
257257
</a>

‎src/routes/dashboard/[slug]/FreeAccessViewer.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<Modal
4747
{open}
4848
onOpenChange={(e) => (open = e.open)}
49-
triggerBase="btn preset-filled-secondary-500 font-bold"
49+
triggerBase="btn preset-filled-primary-500 font-bold"
5050
contentBase="card bg-surface-100-900 p-4 space-y-4 shadow-xl w-[95%] max-w-fit max-h-[95%] overflow-y-auto"
5151
backdropClasses="backdrop-blur-sm"
5252
>

‎src/routes/dashboard/[slug]/SubscriptionViewer.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<Modal
9292
{open}
9393
onOpenChange={(e) => (open = e.open)}
94-
triggerBase="btn preset-filled-secondary-500 font-bold"
94+
triggerBase="btn preset-filled-primary-500 font-bold"
9595
contentBase="card bg-surface-100-900 p-4 space-y-4 shadow-xl w-[95%] max-w-fit max-h-[95%] overflow-y-auto"
9696
backdropClasses="backdrop-blur-sm"
9797
>

‎src/routes/dashboard/[slug]/bundles/+page.svelte‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<main class="m-4">
5050
<h1 class="my-24 text-center">
5151
By making premium scripts you automatically accept the
52-
<a href="/legal/scripter_tos" class="text-tertiary-500"> scripter terms or service</a>
52+
<a href="/legal/scripter_tos" class="anchor"> scripter terms or service</a>
5353
.
5454
</h1>
5555

@@ -71,7 +71,7 @@
7171
<tr>
7272
{#each headers as header (header)}
7373
<th>
74-
<span class="flex justify-center text-center text-secondary-950-50">{header}</span>
74+
<span class="flex justify-center text-center text-primary-950-50">{header}</span>
7575
</th>
7676
{/each}
7777
</tr>
@@ -165,7 +165,7 @@
165165
<button
166166
id="button-{$bundlesForm.bundles[i].id}"
167167
type="submit"
168-
class="btn preset-filled-secondary-500 font-bold"
168+
class="btn preset-filled-primary-500 font-bold"
169169
formaction="?/bundleEdit&product={$bundlesForm.bundles[i].id}"
170170
>
171171
Save

‎src/routes/dashboard/[slug]/general/+page.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
{#each scripters as scripter (scripter.id)}
6666
<a
6767
href="/dashboard/{scripter.id}/general"
68-
class="m-2 mx-auto btn flex w-full justify-around preset-outlined-tertiary-300-700 font-bold hover:border-secondary-500"
68+
class="m-2 mx-auto btn flex w-full justify-around preset-outlined-tertiary-300-700 font-bold hover:border-primary-500"
6969
>
7070
<Avatar
7171
src={scripter.profiles.avatar}

‎src/routes/dashboard/[slug]/scripts/+page.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<main class="m-4">
4848
<h1 class="my-24 text-center">
4949
By making premium scripts you automatically accept the
50-
<a href="/legal/scripter_tos" class="text-tertiary-500"> scripter terms or service</a>
50+
<a href="/legal/scripter_tos" class="anchor"> scripter terms or service</a>
5151
.
5252
</h1>
5353
<div class="my-12 text-center">

‎src/routes/dashboard/[slug]/stripe/+page.svelte‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
{/each}
105105
</div>
106106
{/if}
107-
<button disabled={$countryForm.code === ""} class="btn preset-filled-secondary-500">
107+
<button disabled={$countryForm.code === ""} class="btn preset-filled-primary-500">
108108
Create stripe connected account
109109
</button>
110110
</form>
@@ -114,20 +114,18 @@
114114
<label for="dba">Invoice display name:</label>
115115
<input class="my-2 input" name="dba" id="dba" bind:value={$dbaForm.dba} />
116116
{#if $dbaErrors.dba}
117-
<div
118-
class="max-h-24 overflow-x-hidden overflow-y-scroll rounded-md bg-surface-700 text-error-500"
119-
>
117+
<div class="max-h-24 overflow-x-hidden overflow-y-scroll rounded-md bg-surface-700 text-error-500">
120118
{#each $dbaErrors.dba as err (err)}
121119
{err}
122120
{/each}
123121
</div>
124122
{/if}
125123
</div>
126-
<button class="mx-4 mt-6 btn h-10 preset-filled-secondary-500">Update</button>
124+
<button class="mx-4 mt-6 btn h-10 preset-filled-primary-500">Update</button>
127125
</form>
128126

129127
<form method="POST" action="?/onboardStripe" class="flex justify-center">
130-
<button class="my-2 btn h-10 preset-filled-secondary-500"> Update stripe connected account </button>
128+
<button class="my-2 btn h-10 preset-filled-primary-500"> Update stripe connected account </button>
131129
</form>
132130

133131
{#if account}
@@ -149,7 +147,7 @@
149147
{/if}
150148

151149
<form method="POST" action="?/stripeDashboard" class="flex justify-center">
152-
<button class="my-2 btn h-10 preset-filled-secondary-500"> Stripe Dashboard </button>
150+
<button class="my-2 btn h-10 preset-filled-primary-500"> Stripe Dashboard </button>
153151
</form>
154152
{/if}
155153
{/if}

‎src/routes/setup/+page.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<main class="container mx-auto my-6 min-h-screen max-w-2xl flex-grow">
1111
<div class="my-8 h-screen">
1212
<header class="text-center">
13-
<h1 class="py-16 text-center text-xl text-primary-500 md:text-3xl dark:text-primary-100">
13+
<h1 class="py-16 text-center text-xl text-primary-700 md:text-3xl dark:text-primary-500">
1414
Get started with the Wasp Launcher
1515
</h1>
1616
<a

0 commit comments

Comments
 (0)