From 2da09af28dc91996bd261e008f30bd2b9d0d5a85 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 14 Nov 2023 21:49:37 +0100 Subject: [PATCH] [BRANDING] Update forgejo theme - Inlcude a103b79f60948fa8ee44f95304716f3d354a8c15 and 1b2cd4c4e19c78390be329b4a3ad50ff8857ca8d and 376c0e25f74c967242b860a740fb4d509bae7ee9 and 023e937141dd891bce3370c869d4db2c60f971ed into the Forgejo theme. - Fix tooltips not being visual, due to missing background color. - Fix labels not having a background color. - Fix modals not having a dimmed background. - Fix no syntax highlighting on Forgejo light due to missing imports. - Incorporate feedback from https://codeberg.org/forgejo/forgejo/issues/1117 to make the labels stand out less. (cherry picked from commit bc21dc21e1a375160e97eb1d2023d095d9067ef5) (cherry picked from commit 82323c09cc9439e723618e38104d6b705f94aad9) --- web_src/css/themes/theme-forgejo-dark.css | 7 ++++++- web_src/css/themes/theme-forgejo-light.css | 10 +++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/web_src/css/themes/theme-forgejo-dark.css b/web_src/css/themes/theme-forgejo-dark.css index 1700bc0079..decd3497d7 100644 --- a/web_src/css/themes/theme-forgejo-dark.css +++ b/web_src/css/themes/theme-forgejo-dark.css @@ -212,13 +212,18 @@ /* should ideally be --color-text-dark, see #15651 */ --color-reaction-bg: #ffffff12; --color-reaction-active-bg: var(--color-primary-alpha-30); + --color-tooltip-text: #ffffff; + --color-tooltip-bg: #000000f0; --color-nav-bg: var(--steel-900); --color-nav-hover-bg: var(--steel-600); - --color-label-active-bg: #4c525e; --color-label-text: #fff; + --color-label-bg: #393939; + --color-label-hover-bg: #5f5f5f; + --color-label-active-bg: #4c4c4c; --color-accent: var(--color-primary-light-1); --color-small-accent: var(--color-primary-light-5); --color-active-line: var(--color-primary-alpha-20); + --color-overlay-backdrop: #080808c0; accent-color: var(--color-accent); color-scheme: dark; } diff --git a/web_src/css/themes/theme-forgejo-light.css b/web_src/css/themes/theme-forgejo-light.css index 9ea2a4b166..495b8ce431 100644 --- a/web_src/css/themes/theme-forgejo-light.css +++ b/web_src/css/themes/theme-forgejo-light.css @@ -1,3 +1,6 @@ +@import "../chroma/light.css"; +@import "../codemirror/light.css"; + :root { --steel-900: #10161D; --steel-850: #131A21; @@ -227,12 +230,17 @@ /* should ideally be --color-text-dark, see #15651 */ --color-reaction-bg: #0000000a; --color-reaction-active-bg: var(--color-primary-alpha-20); + --color-tooltip-text: #ffffff; + --color-tooltip-bg: #000000f0; --color-nav-bg: var(--zinc-100); --color-nav-hover-bg: var(--zinc-300); - --color-label-active-bg: #4c525e; + --color-label-bg: #cacaca5b; + --color-label-hover-bg: #cacacaa0; + --color-label-active-bg: #cacacaff; --color-accent: var(--color-primary-light-1); --color-small-accent: var(--color-primary-light-5); --color-active-line: var(--color-primary-light-6); + --color-overlay-backdrop: #080808c0; accent-color: var(--color-accent); color-scheme: light; }