From c1c8405fc6ae71983815b2c6f19126f9c0e4eb57 Mon Sep 17 00:00:00 2001 From: Martin Vladic Date: Sat, 9 Nov 2024 18:23:27 +0100 Subject: [PATCH] dark mode fixes --- .../_images/eez_studio_logo_with_title_dark.png | Bin 0 -> 8119 bytes packages/eez-studio-ui/_stylesheets/app.less | 6 ++++-- packages/eez-studio-ui/_stylesheets/vars.less | 4 ++-- packages/eez-studio-ui/about-box.tsx | 11 +++++++++-- packages/main/settings.ts | 6 +++++- packages/project-editor/ui-components/icons.tsx | 2 +- 6 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 packages/eez-studio-ui/_images/eez_studio_logo_with_title_dark.png diff --git a/packages/eez-studio-ui/_images/eez_studio_logo_with_title_dark.png b/packages/eez-studio-ui/_images/eez_studio_logo_with_title_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a9e01b2180c2db85003de94a22f15772ff8a15f7 GIT binary patch literal 8119 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 ReQ5vy002ovPDHLkV1j+xvS9!K literal 0 HcmV?d00001 diff --git a/packages/eez-studio-ui/_stylesheets/app.less b/packages/eez-studio-ui/_stylesheets/app.less index 87f9a60e..2780dd37 100644 --- a/packages/eez-studio-ui/_stylesheets/app.less +++ b/packages/eez-studio-ui/_stylesheets/app.less @@ -476,8 +476,10 @@ input::placeholder { } button.EezStudio_Action { - &:active { - transform: translate(1px, 1px); + &:not(:disabled) { + &:active { + transform: translate(1px, 1px); + } } &:not(.btn-outline-success, .btn-outline-danger) { diff --git a/packages/eez-studio-ui/_stylesheets/vars.less b/packages/eez-studio-ui/_stylesheets/vars.less index 7cab9f73..4a7c338b 100644 --- a/packages/eez-studio-ui/_stylesheets/vars.less +++ b/packages/eez-studio-ui/_stylesheets/vars.less @@ -1,7 +1,7 @@ @backgroundColor: var(--bs-body-bg); @textColor: var(--bs-body-color); @sectionBackgroundColor: #f0f0f0; -@borderColor: #e0e0e0; +@borderColor: #e2e2e2; @darkBorderColor: #c5c5c5; @panelHeaderColor: var(--bs-tertiary-bg); @selectionBackgroundColor: #337bb7; @@ -93,7 +93,7 @@ @componentShadow: 1px 1px 4px rgba(22, 33, 74, 0.2); @componentBodyShadow: none; -@panelHeaderColorInsideFlexLayout: #e6eaed; +@panelHeaderColorInsideFlexLayout: var(--bs-tertiary-bg); @formControlBorderColor: #ced4da; diff --git a/packages/eez-studio-ui/about-box.tsx b/packages/eez-studio-ui/about-box.tsx index 1ba08f7b..3a1861bc 100644 --- a/packages/eez-studio-ui/about-box.tsx +++ b/packages/eez-studio-ui/about-box.tsx @@ -7,6 +7,7 @@ import { showDialog, Dialog } from "eez-studio-ui/dialog"; import { Loader } from "eez-studio-ui/loader"; import { isArray } from "eez-studio-shared/util"; +import { settingsController } from "home/settings"; const STUDIO_RELEASES_URL = "https://api.github.com/repos/eez-open/studio/releases"; @@ -177,7 +178,13 @@ const AboutBox = observer(
- +
@@ -204,7 +211,7 @@ const AboutBox = observer( {this.versionInfo}