From 7051c33ca96c4cf6d53b208a4cd68c15e2bff2fe Mon Sep 17 00:00:00 2001 From: Jess Martin Date: Wed, 20 Jul 2022 13:06:22 -0400 Subject: [PATCH] Styles from the Figmas --- src/app.html | 56 ++++++++++++++--------------- src/components/Header.svelte | 12 +++++-- src/components/auth/Connect.svelte | 16 +++++++-- src/components/auth/Register.svelte | 19 ++++++---- src/lib/theme/index.ts | 2 +- src/routes/__layout.svelte | 2 -- src/routes/connect.svelte | 1 + src/routes/index.svelte | 2 +- tailwind.config.cjs | 19 +++++----- 9 files changed, 78 insertions(+), 51 deletions(-) diff --git a/src/app.html b/src/app.html index 51f58cc..3601bf3 100644 --- a/src/app.html +++ b/src/app.html @@ -1,33 +1,31 @@ - + + + WebNative Template + + + + + + + + + + + + + + + + + + + - - WebNative Template - - - - - - - - - - - - - - - - - - - - - %sveltekit.head% - - - -
%sveltekit.body%
- + %sveltekit.head% + + +
%sveltekit.body%
+ \ No newline at end of file diff --git a/src/components/Header.svelte b/src/components/Header.svelte index 70b39ca..81a92d6 100644 --- a/src/components/Header.svelte +++ b/src/components/Header.svelte @@ -1,3 +1,11 @@ -
- Connect +
+
+ +
+ +
+ Connect +
\ No newline at end of file diff --git a/src/components/auth/Connect.svelte b/src/components/auth/Connect.svelte index 918db7c..b64600c 100644 --- a/src/components/auth/Connect.svelte +++ b/src/components/auth/Connect.svelte @@ -1,4 +1,16 @@ -
Connect
-Register + +
+
+ ✕ + +
+

Connect to AppName

+ +
+
+
diff --git a/src/components/auth/Register.svelte b/src/components/auth/Register.svelte index 6203524..f267c7e 100644 --- a/src/components/auth/Register.svelte +++ b/src/components/auth/Register.svelte @@ -17,18 +17,25 @@
-
+
+ ✕ +
-

Choose a username

+

Choose a username

-
- Back - +
+ + +
+ +
+ Back +
diff --git a/src/lib/theme/index.ts b/src/lib/theme/index.ts index 25a60bb..3ab07d1 100644 --- a/src/lib/theme/index.ts +++ b/src/lib/theme/index.ts @@ -4,7 +4,7 @@ export type Theme = 'light' | 'dark' export const loadTheme = (): Theme => { if (browser) { - return localStorage.getItem('theme') as Theme ?? 'dark' + return localStorage.getItem('theme') as Theme ?? 'light' } } diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index a2dbf45..b085765 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -9,10 +9,8 @@ }) -
- diff --git a/src/routes/connect.svelte b/src/routes/connect.svelte index 6ff70ce..466c18c 100644 --- a/src/routes/connect.svelte +++ b/src/routes/connect.svelte @@ -1,4 +1,5 @@ + \ No newline at end of file diff --git a/src/routes/index.svelte b/src/routes/index.svelte index 47148b8..4864330 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -8,7 +8,7 @@ init() -

Hello world!

+

Application Interface

diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 25ecb56..a54f799 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -13,22 +13,25 @@ module.exports = { neutral: "#282828", "base-content": "#ffffff", "base-100": "#111111", - "--rounded-box": "2px", - "--rounded-btn": "2px", + "--rounded-box": "16px", + "--rounded-btn": "8px", "--rounded-badge": "2px", - "--tab-radius": "2px" + "--tab-radius": "2px", + "--btn-text-case": "normal-case" }, - light : { - primary: "#43919b", + light: { + primary: "#407FF3", secondary: "#30aadd", accent: "#00ffc6", neutral: "#e5e5e5", "base-content": "#000000", "base-100": "#ffffff", - "--rounded-box": "2px", - "--rounded-btn": "2px", + "--rounded-box": "16px", + "--rounded-btn": "8px", "--rounded-badge": "2px", - "--tab-radius": "2px" + "--tab-radius": "2px", + "--btn-text-case": "normal-case" + // 2rem padding on modal-box }, }, ],