From 8e580385f0db18a19ea858fc590850f4c4d92be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Mon, 15 Jan 2024 17:32:32 +0000 Subject: [PATCH] Tweak tab visuals Make selected tabs not change on hover. Change unselected tabs to use regular font weight and foreground-contrast. --- src/App/Header.svelte | 4 +-- src/App/Settings.svelte | 8 +++-- src/components/Button.svelte | 31 ++++++++++++++----- src/components/ExtendedTextarea.svelte | 4 +-- src/views/projects/Patch.svelte | 2 +- src/views/projects/Source/Blob.svelte | 4 +-- .../projects/Source/BranchSelector.svelte | 2 +- src/views/projects/Source/Header.svelte | 9 +++++- tests/e2e/project.spec.ts | 16 +++++----- tests/e2e/theme.spec.ts | 4 +-- 10 files changed, 54 insertions(+), 30 deletions(-) diff --git a/src/App/Header.svelte b/src/App/Header.svelte index 90759aeea..74af5af29 100644 --- a/src/App/Header.svelte +++ b/src/App/Header.svelte @@ -25,14 +25,14 @@ justify-content: space-between; align-items: center; margin: 0; - padding: 0.5rem; + padding: 0.5rem 1rem; height: 3.5rem; } .left, .right { display: flex; align-items: center; - gap: 1rem; + gap: 0.5rem; } .logo { diff --git a/src/App/Settings.svelte b/src/App/Settings.svelte index 03da3c204..2a9e71afc 100644 --- a/src/App/Settings.svelte +++ b/src/App/Settings.svelte @@ -42,14 +42,14 @@ @@ -65,7 +65,9 @@ styleBorderRadius="0" styleFontFamily={font.fontFamily} on:click={() => storeCodeFont(font.storedName)} - variant={$codeFont === font.storedName ? "gray-white" : "dim"}> + variant={$codeFont === font.storedName + ? "selected" + : "not-selected"}> {font.displayName} {/each} diff --git a/src/components/Button.svelte b/src/components/Button.svelte index 39222b579..1143974a4 100644 --- a/src/components/Button.svelte +++ b/src/components/Button.svelte @@ -3,9 +3,10 @@ export let title: string | undefined = undefined; export let variant: | "background" - | "dim" + | "not-selected" | "gray" | "gray-white" + | "selected" | "none" | "outline" | "primary-toggle-off" @@ -75,29 +76,33 @@ } .background { - color: var(--color-foreground-dim); + color: var(--color-foreground-contrast); background-color: var(--color-background-default); + font-weight: var(--font-weight-regular); } .background[disabled] { color: var(--color-foreground-disabled); background-color: var(--color-background-default); + font-weight: var(--font-weight-regular); } .background:not([disabled]):hover { color: var(--color-foreground-contrast); background-color: var(--color-fill-ghost); } - .dim { + .not-selected { background-color: var(--color-fill-float-hover); - color: var(--color-foreground-dim); + color: var(--color-foreground-contrast); + font-weight: var(--font-weight-normal); } - .dim[disabled] { + .not-selected[disabled] { background-color: var(--color-fill-float-hover); color: var(--color-fill-secondary); + font-weight: var(--font-weight-normal); } - .dim:not([disabled]):hover { + .not-selected:not([disabled]):hover { background-color: var(--color-fill-ghost-hover); - color: var(--color-foreground-dim); + color: var(--color-foreground-contrast); } .gray { @@ -125,6 +130,15 @@ background-color: var(--color-fill-ghost-hover); color: var(--color-foreground-contrast); } + .selected { + background-color: var(--color-fill-ghost); + color: var(--color-foreground-contrast); + cursor: default; + } + .selected[disabled] { + background-color: var(--color-fill-ghost); + color: var(--color-foreground-disabled); + } .none { background-color: transparent; @@ -342,8 +356,9 @@ class:regular={size === "regular"} class:large={size === "large"} class:background={variant === "background"} - class:dim={variant === "dim"} + class:not-selected={variant === "not-selected"} class:gray-white={variant === "gray-white"} + class:selected={variant === "selected"} class:gray={variant === "gray"} class:none={variant === "none"} class:outline={variant === "outline"} diff --git a/src/components/ExtendedTextarea.svelte b/src/components/ExtendedTextarea.svelte index cbe3b9071..8dda19fb6 100644 --- a/src/components/ExtendedTextarea.svelte +++ b/src/components/ExtendedTextarea.svelte @@ -169,7 +169,7 @@ diff --git a/src/views/projects/Source/Blob.svelte b/src/views/projects/Source/Blob.svelte index 4558f5fb2..1e0420f3c 100644 --- a/src/views/projects/Source/Blob.svelte +++ b/src/views/projects/Source/Blob.svelte @@ -204,7 +204,7 @@ @@ -119,6 +120,7 @@ }}>