From 61026481f85adf5510e5e5b905fa51ed5b353214 Mon Sep 17 00:00:00 2001 From: izawartka <59137928+izawartka@users.noreply.github.com> Date: Sat, 16 Aug 2025 00:07:36 +0200 Subject: [PATCH] Updated styling colors *Changed color values of some theme variables *Tracks now have different colors depending on the theme *Changed colors of some elements --- src/components/App.css | 2 +- src/components/Themes.css | 22 +++++++++++++------ src/components/dialog/Dialog.css | 4 ++-- .../scenery-info-dialog/SceneryInfoDialog.css | 2 +- .../track-color-mode/TrackColorMode.css | 2 +- src/helpers/constants.js | 8 +++---- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/components/App.css b/src/components/App.css index 97cc391..65c5628 100644 --- a/src/components/App.css +++ b/src/components/App.css @@ -44,7 +44,7 @@ input[type="text"].non-transparent, button.non-transparent, select.non-transparent { background: var(--layer-color-non-transparent); - border: 2px solid var(--layer-color-non-transparent); + border: 2px solid var(--border-color); } input[type="file"]::file-selector-button:hover, diff --git a/src/components/Themes.css b/src/components/Themes.css index 93c587b..02ca143 100644 --- a/src/components/Themes.css +++ b/src/components/Themes.css @@ -1,13 +1,14 @@ :root { --background-color: #141414; --text-color: #eee; + --half-layer-color: #fff1; --layer-color: #fff2; --layer-color-hover: #fff3; --layer-color-disabled: #fff1; --layer-color-non-transparent: #222; --layer-color-non-transparent-hover: #444; --layer-color-non-transparent-disabled: #222; - --text-color-disabled: #666; + --text-color-disabled: #888; --border-color: #444; --text-color-inverted: #141414; --icon-color: #aaa; @@ -17,6 +18,9 @@ --map-icon-color: #eee; --map-text-color: #eee; --map-platform-color: #444; + --map-track-color: #aaa; + --map-track-color-invisible: #555; + --map-track-color-electrified: #aaf; --dialog-background-color: #222; --parser-log-background-color: #0004; --parser-log-warn-color: #aa4; @@ -27,21 +31,25 @@ --background-color: #eee; --text-color: #222; --layer-color: #0002; + --half-layer-color: #0001; --layer-color-hover: #0003; --layer-color-disabled: #0001; --layer-color-non-transparent: #ddd; - --layer-color-non-transparent-hover: #eee; + --layer-color-non-transparent-hover: #ccc; --layer-color-non-transparent-disabled: #888; - --text-color-disabled: #666; - --border-color: #aaa; + --text-color-disabled: #888; + --border-color: #888; --text-color-inverted: #eee; --icon-color: #222; --icon-color-active: #888; --map-background-color: #fff; --map-shadow-color: #0008; - --map-icon-color: #444; - --map-text-color: #444; - --map-platform-color: #ccc; + --map-icon-color: #111; + --map-text-color: #111; + --map-platform-color: #aaa; + --map-track-color: #555; + --map-track-color-invisible: #999; + --map-track-color-electrified: #33b; --dialog-background-color: #ddd; --parser-log-background-color: #fff4; --parser-log-warn-color: #774; diff --git a/src/components/dialog/Dialog.css b/src/components/dialog/Dialog.css index 1533da2..a6deb98 100644 --- a/src/components/dialog/Dialog.css +++ b/src/components/dialog/Dialog.css @@ -8,12 +8,12 @@ width: 100vw; height: 100vh; z-index: 100; - background-color: rgba(0, 0, 0, 0.25); + background-color: rgba(0, 0, 0, 0.33); } .dialog { display: block; - background-color: var(--dialog-background-color); + background-color: var(--background-color); border: 2px solid var(--border-color); border-radius: 8px; margin: 0 auto; diff --git a/src/components/scenery-info-dialog/SceneryInfoDialog.css b/src/components/scenery-info-dialog/SceneryInfoDialog.css index 0f6ca7e..99f73f1 100644 --- a/src/components/scenery-info-dialog/SceneryInfoDialog.css +++ b/src/components/scenery-info-dialog/SceneryInfoDialog.css @@ -1,6 +1,6 @@ .scenery-info-view td.label { font-weight: bold; - color: var(--text-disabled-color); + color: var(--text-color-disabled); vertical-align: baseline; padding-right: 1em; } diff --git a/src/components/sidemenu/track-color-mode/TrackColorMode.css b/src/components/sidemenu/track-color-mode/TrackColorMode.css index 9fedbe2..e2c571f 100644 --- a/src/components/sidemenu/track-color-mode/TrackColorMode.css +++ b/src/components/sidemenu/track-color-mode/TrackColorMode.css @@ -28,7 +28,7 @@ flex-direction: column; gap: 1em; padding: 1em; - background-color: var(--layer-color); + background-color: var(--half-layer-color); border-radius: 8px; } diff --git a/src/helpers/constants.js b/src/helpers/constants.js index 962e6d2..574dd57 100644 --- a/src/helpers/constants.js +++ b/src/helpers/constants.js @@ -138,16 +138,16 @@ const Constants = { name: 'Standard', optionDefault: 'default', options: { - 'default': ['#aaa', 'Standard track'], - 'invisible': ['#444', 'Invisible track'], + 'default': ['var(--map-track-color)', 'Standard track'], + 'invisible': ['var(--map-track-color-invisible)', 'Invisible track'], } }, 'electrification': { name: 'Electrification', optionDefault: 'conflict', options: { - 'electrified': ['#aaf', 'Electrified'], - 'non-electrified': ['#aaa', 'Non-electrified'], + 'electrified': ['var(--map-track-color-electrified)', 'Electrified'], + 'non-electrified': ['var(--map-track-color)', 'Non-electrified'], 'not-checked': ['#aa4', 'Unknown'], 'conflict': ['#f44', 'Error / Conflict'], }