From c36999868f3dc0bf0b2b809aecffbf15caff07ca Mon Sep 17 00:00:00 2001 From: Tejas Kumar Date: Fri, 10 Nov 2023 11:23:20 +0100 Subject: [PATCH 1/5] Update tailwind config --- web-client/tailwind.config.ts | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/web-client/tailwind.config.ts b/web-client/tailwind.config.ts index bdeda382..8d67f546 100644 --- a/web-client/tailwind.config.ts +++ b/web-client/tailwind.config.ts @@ -1,5 +1,5 @@ import scrollbar from "tailwind-scrollbar"; -import defaultTheme from "tailwindcss/defaultTheme"; +import solar from "@crabnebula/solar" export default { content: ["./index.html", "./src/**/*.{js,jsx,ts,tsx}"], @@ -8,25 +8,7 @@ export default { spacing: { toolbar: 'var(--toolbar-height)', }, - fontFamily: { - 'sans': ['Euclid Circular B', 'Inter', ...defaultTheme.fontFamily.sans] - }, - colors: { - "navy": { - 50: "#DCE2F4", - 100: "#B9C6E9", - 200: "#738DD3", - 300: "#3859B2", - 400: "#22366D", - 500: "#0C1326", - 600: "#0A0F1F", - 700: "#070C17", - 800: "#050810", - 900: "#020408", - 950: "#010204" - } - } - }, + } }, - plugins: [scrollbar({ nocompatible: true })], + plugins: [solar, scrollbar({ nocompatible: true })], }; From fd29b1a752d47cc9cf1b45493409661aec9fee26 Mon Sep 17 00:00:00 2001 From: Tejas Kumar Date: Fri, 10 Nov 2023 11:23:41 +0100 Subject: [PATCH 2/5] Adjust breaking changes --- web-client/src/styles.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web-client/src/styles.css b/web-client/src/styles.css index 32f06db1..f1d698e6 100644 --- a/web-client/src/styles.css +++ b/web-client/src/styles.css @@ -12,10 +12,18 @@ html { @layer base { * { - @apply scrollbar-thin scrollbar-track-neutral-900 scrollbar-thumb-rounded scrollbar-thumb-neutral-600; + @apply scrollbar-thin scrollbar-thumb-rounded; } } +::-webkit-scrollbar-thumb { + @apply bg-gray-700; +} + +::-webkit-scrollbar-track { + @apply bg-gray-900; +} + .surf-container { @apply overflow-hidden absolute inset-0 w-full h-full; z-index: -1; From 6f43eb2044ee790569babb8449c4305b70c24e7c Mon Sep 17 00:00:00 2001 From: Tejas Kumar Date: Fri, 10 Nov 2023 11:23:53 +0100 Subject: [PATCH 3/5] Use solar tokens --- web-client/index.html | 4 +-- web-client/src/components/filter-toggle.tsx | 2 +- web-client/src/components/form-field.tsx | 2 +- web-client/src/components/navigation.tsx | 4 +-- web-client/src/views/dashboard/console.tsx | 29 +++++++++++-------- web-client/src/views/dashboard/layout.tsx | 3 -- .../src/views/dashboard/tauri-config.tsx | 8 ++--- 7 files changed, 27 insertions(+), 25 deletions(-) diff --git a/web-client/index.html b/web-client/index.html index 2ccb5478..30b6ff1d 100644 --- a/web-client/index.html +++ b/web-client/index.html @@ -6,10 +6,10 @@ Tauri Devtools Web-Client - +
diff --git a/web-client/src/components/filter-toggle.tsx b/web-client/src/components/filter-toggle.tsx index 95dabf5e..f56ff71e 100644 --- a/web-client/src/components/filter-toggle.tsx +++ b/web-client/src/components/filter-toggle.tsx @@ -18,7 +18,7 @@ export function FilterToggle(props: FilterToggleProps) { onChange={props.changeHandler} > {(state) => ( - + {props.children} )} diff --git a/web-client/src/components/form-field.tsx b/web-client/src/components/form-field.tsx index 2dd6a8ab..8e5925f1 100644 --- a/web-client/src/components/form-field.tsx +++ b/web-client/src/components/form-field.tsx @@ -26,7 +26,7 @@ export const FormField = (props: Props) => { value={props.value} placeholder={props.placeholder} onInput={props.onInput} - class="text-2xl bg-transparent border-b border-white focus:border-teal-500 p-2" + class="text-2xl bg-transparent border-b border-white focus:border-consulting-500 p-2" /> ); diff --git a/web-client/src/components/navigation.tsx b/web-client/src/components/navigation.tsx index 16fdd3b3..98675b96 100644 --- a/web-client/src/components/navigation.tsx +++ b/web-client/src/components/navigation.tsx @@ -26,7 +26,7 @@ export function Navigation() { const location = useLocation(); return (