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 @@ storeTheme("light")}> storeTheme("dark")}> @@ -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 @@ { preview = false; }}> @@ -179,7 +179,7 @@ { preview = true; }}> diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte index f9fa4e8d8..2b7623ee5 100644 --- a/src/views/projects/Patch.svelte +++ b/src/views/projects/Patch.svelte @@ -754,7 +754,7 @@ + variant={name === view.name ? "selected" : "not-selected"}> {capitalize(name)} 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 @@ { window.location.hash = ""; showMarkdown = true; @@ -213,7 +213,7 @@ { showMarkdown = false; }}> diff --git a/src/views/projects/Source/BranchSelector.svelte b/src/views/projects/Source/BranchSelector.svelte index 3c1dee1fe..a92410b79 100644 --- a/src/views/projects/Source/BranchSelector.svelte +++ b/src/views/projects/Source/BranchSelector.svelte @@ -98,7 +98,7 @@ diff --git a/src/views/projects/Source/Header.svelte b/src/views/projects/Source/Header.svelte index af032517c..e6d3827dd 100644 --- a/src/views/projects/Source/Header.svelte +++ b/src/views/projects/Source/Header.svelte @@ -104,6 +104,7 @@ }}> Files @@ -119,6 +120,7 @@ }}> @@ -133,7 +135,12 @@ - + Contributors diff --git a/tests/e2e/project.spec.ts b/tests/e2e/project.spec.ts index 6a2f004ce..361f9a42d 100644 --- a/tests/e2e/project.spec.ts +++ b/tests/e2e/project.spec.ts @@ -113,7 +113,7 @@ test("navigate line numbers", async ({ page }) => { // file. await page.getByRole("link", { name: "footnotes.md" }).click(); await expect(page.getByRole("button", { name: "Markdown" })).toHaveClass( - /gray-white/, + /selected/, ); }); @@ -239,17 +239,17 @@ test("markdown files", async ({ page }) => { // Switch between raw and rendered modes. { await expect(page.getByRole("button", { name: "Markdown" })).toHaveClass( - /gray-white/, + /selected/, ); - await expect(page.getByRole("button", { name: "Plain" })).not.toHaveClass( - /gray-white/, + await expect(page.getByRole("button", { name: "Plain" })).toHaveClass( + /not-selected/, ); await page.getByRole("button", { name: "Plain" }).click(); - await expect( - page.getByRole("button", { name: "Markdown" }), - ).not.toHaveClass(/gray-white/); + await expect(page.getByRole("button", { name: "Markdown" })).toHaveClass( + /not-selected/, + ); await expect(page.getByRole("button", { name: "Plain" })).toHaveClass( - /gray-white/, + /selected/, ); await expect(page.getByText("##### Table of Contents")).toBeVisible(); await page.getByRole("button", { name: "Markdown" }).click(); diff --git a/tests/e2e/theme.spec.ts b/tests/e2e/theme.spec.ts index 04993b0fd..f8cb8876b 100644 --- a/tests/e2e/theme.spec.ts +++ b/tests/e2e/theme.spec.ts @@ -68,11 +68,11 @@ test("change code font", async ({ page }) => { await page.getByRole("button", { name: "Settings" }).first().click(); await page.getByText("System").click(); - await expect(page.getByText("System")).toHaveClass(/gray-white/); + await expect(page.getByText("System")).toHaveClass(/selected/); await expect(page.locator("html")).toHaveAttribute("data-codefont", "system"); await page.getByText("JetBrains Mono").click(); - await expect(page.getByText("JetBrains Mono")).toHaveClass(/gray-white/); + await expect(page.getByText("JetBrains Mono")).toHaveClass(/selected/); await expect(page.locator("html")).toHaveAttribute( "data-codefont", "jetbrains",