From 69d5f974882016822f9f91938298fc4a0e4d0acb Mon Sep 17 00:00:00 2001 From: pythongosssss <125205205+pythongosssss@users.noreply.github.com> Date: Thu, 21 Mar 2024 18:08:46 +0000 Subject: [PATCH] Fix colors on all themes --- web/extensions/core/colorPalette.js | 30 ++++++++++++++++++++++++++--- web/scripts/ui/menu/menu.css | 16 ++++++++++----- web/style.css | 14 +++++++++++--- 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/web/extensions/core/colorPalette.js b/web/extensions/core/colorPalette.js index b8d83613d..ccbf9b142 100644 --- a/web/extensions/core/colorPalette.js +++ b/web/extensions/core/colorPalette.js @@ -59,6 +59,10 @@ const colorPalettes = { "border-color": "#4e4e4e", "tr-even-bg-color": "#222", "tr-odd-bg-color": "#353535", + "content-bg": "#4e4e4e", + "content-fg": "#fff", + "content-hover-bg": "#222", + "content-hover-fg": "#fff" } }, }, @@ -116,6 +120,10 @@ const colorPalettes = { "border-color": "#888", "tr-even-bg-color": "#f9f9f9", "tr-odd-bg-color": "#fff", + "content-bg": "#e0e0e0", + "content-fg": "#222", + "content-hover-bg": "#adadad", + "content-hover-fg": "#222" } }, }, @@ -172,6 +180,10 @@ const colorPalettes = { "border-color": "#657b83", // Base00 "tr-even-bg-color": "#002b36", "tr-odd-bg-color": "#073642", + "content-bg": "#657b83", + "content-fg": "#fdf6e3", + "content-hover-bg": "#002b36", + "content-hover-fg": "#fdf6e3" } }, }, @@ -240,7 +252,11 @@ const colorPalettes = { "error-text": "#ff4444", "border-color": "#6e7581", "tr-even-bg-color": "#2b2f38", - "tr-odd-bg-color": "#242730" + "tr-odd-bg-color": "#242730", + "content-bg": "#6e7581", + "content-fg": "#fff", + "content-hover-bg": "#2b2f38", + "content-hover-fg": "#fff" } }, }, @@ -309,7 +325,11 @@ const colorPalettes = { "error-text": "#ff4444", "border-color": "#545d70", "tr-even-bg-color": "#2e3440", - "tr-odd-bg-color": "#161b22" + "tr-odd-bg-color": "#161b22", + "content-bg": "#545d70", + "content-fg": "#e5eaf0", + "content-hover-bg": "#2e3440", + "content-hover-fg": "#e5eaf0" } }, }, @@ -378,7 +398,11 @@ const colorPalettes = { "error-text": "#ff4444", "border-color": "#30363d", "tr-even-bg-color": "#161b22", - "tr-odd-bg-color": "#13171d" + "tr-odd-bg-color": "#13171d", + "content-bg": "#30363d", + "content-fg": "#e5eaf0", + "content-hover-bg": "#161b22", + "content-hover-fg": "#e5eaf0" } }, } diff --git a/web/scripts/ui/menu/menu.css b/web/scripts/ui/menu/menu.css index 735bc29e9..cd2888b91 100644 --- a/web/scripts/ui/menu/menu.css +++ b/web/scripts/ui/menu/menu.css @@ -83,7 +83,8 @@ .comfyui-split-button-popup { white-space: nowrap; - background-color: var(--border-color); + background-color: var(--content-bg); + color: var(--content-fg); display: flex; flex-direction: column; overflow: auto; @@ -146,6 +147,7 @@ .comfyui-menu .comfyui-button:not(:disabled):hover { background: var(--border-color); + color: var(--content-fg); } .comfyui-menu .comfyui-split-button-popup > .comfyui-button { @@ -164,7 +166,8 @@ } .comfyui-menu .comfyui-button.popup-open { - background-color: var(--border-color); + background-color: var(--content-bg); + color: var(--content-fg); } .comfyui-menu-push { @@ -242,7 +245,8 @@ font-size: 0.8em; padding: 10px; overflow: auto; - background-color: var(--border-color); + background-color: var(--content-bg); + color: var(--content-fg); border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; @@ -364,7 +368,8 @@ width: 100%; left: 0; height: var(--item-height); - background-color: var(--comfy-input-bg); + background-color: var(--content-hover-bg); + color: var(--content-hover-fg); z-index: -1; } @@ -419,7 +424,8 @@ /* View List */ .comfyui-view-list-popup { padding: 10px; - background-color: var(--border-color); + background-color: var(--content-bg); + color: var(--content-fg); min-width: 170px; min-height: 100px; display: flex; diff --git a/web/style.css b/web/style.css index 8bf18612f..09eece1ac 100644 --- a/web/style.css +++ b/web/style.css @@ -13,15 +13,23 @@ --tr-even-bg-color: #222; --tr-odd-bg-color: #353535; --primary-bg: #236692; - --primary-fg: #ffffff; - --primary-hover-bg: #3485bb; - --primary-hover-fg: #ffffff; + --primary-fg: #ffffff; + --primary-hover-bg: #3485bb; + --primary-hover-fg: #ffffff; + --content-bg: #e0e0e0; + --content-fg: #000; + --content-hover-bg: #adadad; + --content-hover-fg: #000; } @media (prefers-color-scheme: dark) { :root { --fg-color: #fff; --bg-color: #202020; + --content-bg: #4e4e4e; + --content-fg: #fff; + --content-hover-bg: #222; + --content-hover-fg: #fff; } }