From 99a0d8d6f28cc5c60134887f17507f62bb3be72c Mon Sep 17 00:00:00 2001 From: dnlklmn Date: Tue, 12 Dec 2023 11:41:02 +0100 Subject: [PATCH] Fix gray colors --- public/colors.css | 14 ++++++-------- src/components/Badge.svelte | 2 +- src/components/Button.svelte | 4 ++-- src/components/ExternalLink.svelte | 2 +- src/components/Markdown.svelte | 4 ++-- src/modals/ColorPaletteModal.svelte | 1 - src/views/projects/Cob/Revision.svelte | 4 ++-- src/views/projects/Patch.svelte | 2 +- src/views/projects/Patch/PatchTeaser.svelte | 2 +- src/views/projects/Source/Blob.svelte | 2 +- 10 files changed, 17 insertions(+), 20 deletions(-) diff --git a/public/colors.css b/public/colors.css index d239d4642..e08c58f48 100644 --- a/public/colors.css +++ b/public/colors.css @@ -3,9 +3,9 @@ --color-background-float: #fafaff; --color-background-dip: #f5f5ff; --color-foreground-contrast: #232563; - --color-foreground-dim: #70718f; - --color-foreground-emphasized: #7070ff; - --color-foreground-emphasized-hover: #8585ff; + --color-foreground-dim: #6a6a81; + --color-foreground-emphasized: #8585ff; + --color-foreground-emphasized-hover: #7070ff; --color-foreground-match-background: #f5f5ff; --color-foreground-white: #ffffff; --color-foreground-black: #000000; @@ -13,9 +13,8 @@ --color-foreground-primary-hover: #ff80ff; --color-foreground-success: #4fa877; --color-foreground-red: #aa5078; - --color-foreground-gray: #9494b8; --color-foreground-yellow: #e5c001; - --color-foreground-disabled: #b2b2cc; + --color-foreground-disabled: #9b9bb1; --color-border-hint: #dbdbff; --color-border-default: #dbdbff; --color-border-focus: #7070ff; @@ -56,7 +55,7 @@ --color-background-float: #14151a; --color-background-dip: #000000; --color-foreground-contrast: #f9f9fb; - --color-foreground-dim: #9494b8; + --color-foreground-dim: #9b9bb1; --color-foreground-emphasized: #7070ff; --color-foreground-emphasized-hover: #8585ff; --color-foreground-match-background: #0a0d10; @@ -66,9 +65,8 @@ --color-foreground-primary-hover: #ff80ff; --color-foreground-success: #4fa877; --color-foreground-red: #aa5078; - --color-foreground-gray: #9494b8; --color-foreground-yellow: #e5c001; - --color-foreground-disabled: #494a5a; + --color-foreground-disabled: #6a6a81; --color-border-hint: #24252d; --color-border-default: #2e2f38; --color-border-focus: #7070ff; diff --git a/src/components/Badge.svelte b/src/components/Badge.svelte index ac2dbe02c..8b85f0dd7 100644 --- a/src/components/Badge.svelte +++ b/src/components/Badge.svelte @@ -36,7 +36,7 @@ } .foreground { color: var(--color-foreground-match-background); - background: var(--color-foreground-gray); + background: var(--color-fill-gray); } .neutral { color: var(--color-foreground-contrast); diff --git a/src/components/Button.svelte b/src/components/Button.svelte index fbf056b0e..8e7974c06 100644 --- a/src/components/Button.svelte +++ b/src/components/Button.svelte @@ -80,7 +80,7 @@ .dim { background-color: var(--color-fill-float-hover); - color: var(--color-foreground-gray); + color: var(--color-foreground-dim); } .dim[disabled] { background-color: var(--color-fill-float-hover); @@ -88,7 +88,7 @@ } .dim:not([disabled]):hover { background-color: var(--color-fill-ghost-hover); - color: var(--color-foreground-gray); + color: var(--color-foreground-dim); } .gray { diff --git a/src/components/ExternalLink.svelte b/src/components/ExternalLink.svelte index 1c7db4750..a244d8cd6 100644 --- a/src/components/ExternalLink.svelte +++ b/src/components/ExternalLink.svelte @@ -23,7 +23,7 @@ } .icon { - color: var(--color-foreground-gray); + color: var(--color-foreground-dim); position: relative; bottom: 1px; } diff --git a/src/components/Markdown.svelte b/src/components/Markdown.svelte index fc073b345..5165017b9 100644 --- a/src/components/Markdown.svelte +++ b/src/components/Markdown.svelte @@ -278,7 +278,7 @@ } .markdown :global(h6) { - color: var(--color-foreground-gray); + color: var(--color-foreground-dim); } .markdown :global(p) { @@ -303,7 +303,7 @@ } .markdown :global(blockquote) { - color: var(--color-foreground-gray); + color: var(--color-foreground-dim); border-left: 0.3rem solid var(--color-fill-ghost); padding: 0 0 0 1rem; margin: 1rem 0 1rem 0; diff --git a/src/modals/ColorPaletteModal.svelte b/src/modals/ColorPaletteModal.svelte index 9bd4407ce..c56bb3bec 100644 --- a/src/modals/ColorPaletteModal.svelte +++ b/src/modals/ColorPaletteModal.svelte @@ -67,7 +67,6 @@ "--color-foreground-dim", "--color-foreground-disabled", "--color-foreground-emphasized", - "--color-foreground-gray", "--color-foreground-match", "--color-foreground-primary", "--color-foreground-red", diff --git a/src/views/projects/Cob/Revision.svelte b/src/views/projects/Cob/Revision.svelte index 7b91ecd90..1150be266 100644 --- a/src/views/projects/Cob/Revision.svelte +++ b/src/views/projects/Cob/Revision.svelte @@ -77,13 +77,13 @@ case "reject": return "var(--color-foreground-red)"; default: - return "var(--color-foreground-gray)"; + return "var(--color-fill-gray)"; } } function badgeColor({ status }: PatchState): string | undefined { if (status === "draft") { - return "var(--color-foreground-gray)"; + return "var(--color-fill-gray)"; } else if (status === "open") { return "var(--color-foreground-success)"; } else if (status === "archived") { diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte index 6d4bf1b1a..5af7b8314 100644 --- a/src/views/projects/Patch.svelte +++ b/src/views/projects/Patch.svelte @@ -578,7 +578,7 @@ gap: 0.5rem; } .draft { - color: var(--color-foreground-gray); + color: var(--color-foreground-dim); } .open { color: var(--color-fill-success); diff --git a/src/views/projects/Patch/PatchTeaser.svelte b/src/views/projects/Patch/PatchTeaser.svelte index 25eab3381..67fcd0f2d 100644 --- a/src/views/projects/Patch/PatchTeaser.svelte +++ b/src/views/projects/Patch/PatchTeaser.svelte @@ -96,7 +96,7 @@ text-overflow: ellipsis; } .draft { - color: var(--color-foreground-gray); + color: var(--color-foreground-dim); } .open { color: var(--color-fill-success); diff --git a/src/views/projects/Source/Blob.svelte b/src/views/projects/Source/Blob.svelte index 7670b818f..f2477f4ed 100644 --- a/src/views/projects/Source/Blob.svelte +++ b/src/views/projects/Source/Blob.svelte @@ -111,7 +111,7 @@ } .code :global(.line-number:hover) { cursor: pointer; - color: var(--color-foreground-gray); + color: var(--color-foreground-dim); } .code :global(.content) {