diff --git a/assets/editor/theme.rcss b/assets/editor/theme.rcss index 74af312..213da0d 100644 --- a/assets/editor/theme.rcss +++ b/assets/editor/theme.rcss @@ -1,166 +1,244 @@ /* SPDX-License-Identifier: GPL-3.0-only */ -body { margin: 0; width: 100%; height: 100%; overflow: hidden; font-family: LatoLatin; font-size: 15dp; color: #e7eff4; background-color: #101c2b; } +/* The submenu palettes are shared by every surface and control. RmlUI 6.3 + resolves these inherited custom properties when the body class changes. */ +body { + --text: #dce3e9; + --muted: #a8b8c8; + --accent: #a9dccb; + --window-top: #303c49; + --window-bottom: #1a2531; + --chrome: #d5e3ed0a; + --sidebar: #111a2426; + --panel: #111a2433; + --wash: #e3edf605; + --control-top: #c1d1e31c; + --control-bottom: #869eb312; + --input: #17232e99; + --popup: #293744; + --hover: #d0e2f226; + --selected: #a9d4c526; + --selected-hover: #a9d4c53d; + --selected-text: #e8f5ef; + --border: #e2ebf02b; + --divider: #d4e1eb12; + --accent-border: #a9d4c55c; + --focus: #8cc8ff; + --danger: #f0aaa7; + --danger-border: #f0aaa75c; + --warning: #e1c68b; + --positive: #b5dfcf; + --note: #a9d4c50a; + --modal: #283542; + --overlay: #0b11189c; + --image-stage: #1b2733; + --crop: #a9dccb; + --crop-wash: #a9dccb16; + --scrollbar: #a8b8c860; + --scrollbar-hover: #a8b8c899; + --toggle-off: #617483; + --toggle-on: #a9dccb; + margin: 0; width: 100%; height: 100%; overflow: hidden; + font-family: LatoLatin; font-size: 15dp; color: var(--text); + background-color: var(--window-bottom); + decorator: linear-gradient(155deg, var(--window-top), var(--window-bottom)); +} +body.silver { + --text: #233443; + --muted: #526779; + --accent: #25617a; + --window-top: #f0f5f9; + --window-bottom: #d4e0ea; + --chrome: #ffffff45; + --sidebar: #42627d09; + --panel: #f1f6fa80; + --wash: #42627d09; + --control-top: #ffffffb0; + --control-bottom: #bfd0e259; + --input: #ffffffad; + --popup: #f3f7fc; + --hover: #9eb9d43b; + --selected: #a3c3dd54; + --selected-hover: #a3c3dd88; + --selected-text: #193b52; + --border: #6c879c4a; + --divider: #6c879c28; + --accent-border: #356f966e; + --focus: #2b729a; + --danger: #a23f45; + --danger-border: #a23f4566; + --warning: #805b18; + --positive: #2e6953; + --note: #2e69530a; + --modal: #eaf1f7; + --overlay: #21324166; + --image-stage: #cfdae3; + --crop: #25617a; + --crop-wash: #25617a16; + --scrollbar: #6c879c88; + --scrollbar-hover: #526779bb; + --toggle-off: #91a8b8; + --toggle-on: #25617a; +} +body.matchday { + --text: #efeded; + --muted: #b7b4b9; + --accent: #efb2aa; + --window-top: #343338; + --window-bottom: #202126; + --chrome: #ffffff07; + --sidebar: #1d1e2426; + --panel: #1d1e2466; + --wash: #f8e7e00a; + --control-top: #e8d6dc12; + --control-bottom: #a1a0aa0d; + --input: #191a208a; + --popup: #303037; + --hover: #d5b3b423; + --selected: #d48c7b26; + --selected-hover: #d48c7b3d; + --selected-text: #ffe5de; + --border: #ead9da29; + --divider: #ead9da16; + --accent-border: #e5a19770; + --focus: #efb2aa; + --danger: #f0a6a7; + --danger-border: #f0a6a75c; + --warning: #e1c68b; + --positive: #afd1be; + --note: #afd1be0a; + --modal: #2c2c32; + --overlay: #1111149c; + --image-stage: #23242a; + --crop: #efb2aa; + --crop-wash: #efb2aa16; + --scrollbar: #827c8199; + --scrollbar-hover: #b7b4b999; + --toggle-off: #68646c; + --toggle-on: #efb2aa; +} * { box-sizing: border-box; } div, h1, h2, p, label, header, aside, section, footer { display: block; } span { display: inline-block; } #shell { width: 100%; height: 100%; display: flex; flex-direction: column; } -header { height: 86dp; flex-shrink: 0; display: flex; align-items: center; padding: 0 28dp; background-color: #142438; border-bottom: 1dp #ffffff16; } +header { height: 86dp; flex-shrink: 0; display: flex; align-items: center; padding: 0 28dp; background-color: var(--chrome); border-bottom: 1dp var(--border); } .brand { display: flex; align-items: center; width: 300dp; } -.brand-mark { width: 43dp; height: 43dp; line-height: 43dp; font-size: 21dp; font-weight: bold; text-align: center; border: 1dp #71d4b568; border-radius: 13dp; color: #83ddc4; background-color: #71d4b50c; margin-right: 13dp; } -.brand-mark span { color: #dceee9; } +.brand-mark { width: 43dp; height: 43dp; line-height: 43dp; font-size: 21dp; font-weight: bold; text-align: center; border: 1dp var(--accent-border); border-radius: 13dp; color: var(--accent); background-color: var(--wash); margin-right: 13dp; } +.brand-mark span { color: var(--text); } h1, h2, p { margin: 0; } h2 { font-size: 20dp; font-weight: bold; } -h2 span { font-weight: normal; color: #96aebf; } -small { display: block; font-size: 12dp; color: #94aabd; margin-top: 4dp; } -#world-caption { flex: 1; font-size: 14dp; color: #c3d2dc; overflow: hidden; white-space: nowrap; } +h2 span { font-weight: normal; color: var(--muted); } +small { display: block; font-size: 12dp; color: var(--muted); margin-top: 4dp; } +#world-caption { flex: 1; font-size: 14dp; color: var(--muted); overflow: hidden; white-space: nowrap; } #top-actions, #bottom-actions, #page-actions, .button-row { display: flex; align-items: center; gap: 8dp; } -button { font-family: LatoLatin; font-size: 14dp; color: #dce7ef; background-color: #ffffff09; border: 1dp #9eafbf32; border-radius: 8dp; padding: 9dp 14dp; cursor: pointer; text-align: center; white-space: nowrap; tab-index: auto; } -button:hover { background-color: #ffffff16; border-color: #acccdc80; } -button:focus, input:focus, select:focus, textarea:focus { border-color: #7cdbbf; } -button.primary { background-color: #8dd6bf; color: #102b2b; border-color: #8dd6bf; font-weight: bold; } -button.primary:hover { background-color: #afe5d3; } -button.danger { color: #f4a5a3; border-color: #dc777d66; } +button { font-family: LatoLatin; font-size: 14dp; color: var(--text); background-color: transparent; decorator: linear-gradient(var(--control-top), var(--control-bottom)); border: 1dp var(--border); border-radius: 8dp; padding: 9dp 14dp; cursor: pointer; text-align: center; white-space: nowrap; tab-index: auto; } +button:hover { background-color: var(--hover); decorator: none; } +button.primary { background-color: var(--selected); decorator: none; color: var(--selected-text); border-color: var(--accent-border); font-weight: bold; } +button.primary:hover { background-color: var(--selected-hover); } +button.danger { color: var(--danger); border-color: var(--danger-border); } button:disabled { opacity: 0.35; cursor: unavailable; } -button.quiet { border-color: transparent; background-color: transparent; } +button.quiet { border-color: transparent; background-color: transparent; decorator: none; } +button.quiet:hover { background-color: var(--hover); } #main { flex: 1; display: flex; min-height: 0; } -aside { width: 220dp; flex-shrink: 0; padding: 28dp 14dp 18dp; display: flex; flex-direction: column; background-color: #122033; border-right: 1dp #ffffff12; } -.eyebrow { font-size: 11dp; font-weight: bold; letter-spacing: 1.5dp; color: #91a9b9; text-transform: uppercase; } +aside { width: 220dp; flex-shrink: 0; padding: 28dp 14dp 18dp; display: flex; flex-direction: column; background-color: var(--sidebar); border-right: 1dp var(--divider); } +.eyebrow { font-size: 11dp; font-weight: bold; letter-spacing: 1.5dp; color: var(--muted); text-transform: uppercase; } #nav-label { padding: 0 14dp 18dp; } #navigation { display: flex; flex-direction: column; gap: 5dp; } -.nav { width: 100%; display: flex; align-items: center; padding: 11dp 13dp; text-align: left; border-color: transparent; background-color: transparent; font-size: 15dp; } +.nav { width: 100%; display: flex; align-items: center; padding: 11dp 13dp; text-align: left; border-color: transparent; background-color: transparent; decorator: none; font-size: 15dp; } .nav .glyph { width: 20dp; height: 20dp; margin-right: 16dp; flex-shrink: 0; } -.nav.selected { background-color: #80cfb51c; color: #a6e6d3; border-color: #80cfb53a; } -.nav.selected .glyph { color: #a6e6d3; } -.aside-foot { margin-top: auto; padding: 24dp 14dp 0; font-size: 12dp; color: #92aabb; } +.nav.selected { background-color: var(--selected); color: var(--accent); border-color: var(--accent-border); } +.aside-foot { margin-top: auto; padding: 24dp 14dp 0; font-size: 12dp; color: var(--muted); } .aside-foot small { line-height: 1.45; } -.small-pitch { height: 50dp; width: 84dp; border: 1dp #91a9b933; border-radius: 4dp; margin-bottom: 15dp; position: relative; } -.small-pitch div { position: absolute; width: 20dp; height: 20dp; border: 1dp #91a9b933; border-radius: 10dp; left: 31dp; top: 14dp; } +.small-pitch { height: 50dp; width: 84dp; border: 1dp var(--border); border-radius: 4dp; margin-bottom: 15dp; position: relative; } +.small-pitch div { position: absolute; width: 20dp; height: 20dp; border: 1dp var(--border); border-radius: 10dp; left: 31dp; top: 14dp; } #workspace { flex: 1; padding: 28dp 30dp 16dp; display: flex; flex-direction: column; min-width: 0; } #page-heading { display: flex; justify-content: space-between; align-items: center; margin-bottom: 23dp; flex-shrink: 0; } h1 { font-size: 28dp; font-weight: bold; margin-top: 7dp; } -#page-subtitle { color: #9fb3c2; margin-top: 7dp; font-size: 14dp; } +#page-subtitle { color: var(--muted); margin-top: 7dp; font-size: 14dp; } #toolbar { display: flex; gap: 10dp; margin-bottom: 16dp; flex-shrink: 0; align-items: center; } -input, select, textarea { font-family: LatoLatin; font-size: 14dp; background-color: #0d1a29; color: #e6eef3; border: 1dp #7c9bb23b; border-radius: 7dp; padding: 9dp 10dp; height: 38dp; tab-index: auto; } -input[type=checkbox] { width: 18dp; height: 18dp; padding: 2dp; background-color: #1e3448; } -input[type=checkbox]:checked { background-color: #80cfb5; decorator: none; } +input, select, textarea { font-family: LatoLatin; font-size: 14dp; background-color: var(--input); color: var(--text); border: 1dp var(--border); border-radius: 7dp; padding: 9dp 10dp; height: 38dp; tab-index: auto; } +input[type=checkbox] { width: 18dp; height: 18dp; padding: 2dp; background-color: var(--toggle-off); } +input[type=checkbox]:checked { background-color: var(--toggle-on); decorator: none; } input[type=range] { height: 24dp; padding: 0; } -input[type=range] track { height: 4dp; background-color: #6c8c9c55; margin: 9dp 0; border-radius: 2dp; } -input[type=range] bar { width: 16dp; height: 16dp; border-radius: 8dp; background-color: #9bdac8; margin-top: 3dp; } +input[type=range] track { height: 4dp; background-color: var(--scrollbar); margin: 9dp 0; border-radius: 2dp; } +input[type=range] bar { width: 16dp; height: 16dp; border-radius: 8dp; background-color: var(--accent); margin-top: 3dp; } select { padding-right: 25dp; } select selectvalue { padding: 0; } -select selectarrow { width: 9dp; height: 9dp; margin-right: 9dp; margin-top: 11dp; decorator: none; border-bottom: 2dp #94b1c4; border-right: 2dp #94b1c4; transform: rotate(45deg); } -select selectbox { background-color: #1b2d40; color: #edf4f8; border: 1dp #66869f; border-radius: 8dp; padding: 5dp; max-height: 290dp; overflow-y: auto; } +select selectarrow { width: 9dp; height: 9dp; margin-right: 9dp; margin-top: 11dp; decorator: none; border-bottom: 2dp var(--muted); border-right: 2dp var(--muted); transform: rotate(45deg); } +select selectbox { background-color: var(--popup); color: var(--text); border: 1dp var(--border); border-radius: 8dp; padding: 5dp; max-height: 290dp; overflow-y: auto; } select option { font-size: 14dp; padding: 8dp; border-radius: 4dp; } -select option:hover, select option:checked { background-color: #537c9666; } +select option:hover, select option:checked { background-color: var(--selected); color: var(--selected-text); } #search { width: 250dp; margin-right: auto; } #filter-nation, #filter-league { width: 205dp; } #filter-team { width: 240dp; } #page-content { flex: 1; min-height: 0; display: flex; } .split { width: 100%; display: flex; gap: 20dp; min-height: 0; } -.list-panel { flex: 1; min-width: 0; border: 1dp #9db7cb23; border-radius: 12dp; overflow: hidden; background-color: #18283b99; display: flex; flex-direction: column; } -.table-header { display: flex; align-items: center; height: 42dp; flex-shrink: 0; padding: 0 16dp; background-color: #ffffff08; border-bottom: 1dp #91aabd22; } -.table-header button { flex: 1; text-align: left; padding: 0; border: 0; background-color: transparent; font-size: 12dp; color: #9eb4c4; } +.list-panel { flex: 1; min-width: 0; border: 1dp var(--border); border-radius: 12dp; overflow: hidden; background-color: var(--panel); display: flex; flex-direction: column; } +.table-header { display: flex; align-items: center; height: 42dp; flex-shrink: 0; padding: 0 16dp; background-color: var(--wash); border-bottom: 1dp var(--divider); } +.table-header button { flex: 1; text-align: left; padding: 0; border: 0; background-color: transparent; decorator: none; font-size: 12dp; color: var(--muted); } +.table-header button:hover { color: var(--text); } .table-header button:first-child { flex: 2; } .table-scroll { flex: 1; overflow-y: auto; } -.record { display: flex; align-items: center; width: 100%; min-height: 49dp; padding: 9dp 16dp; border: 0; border-bottom: 1dp #9db7cb12; border-radius: 0; background-color: transparent; text-align: left; } -.record:hover { background-color: #ffffff08; } -.record.selected { background-color: #70cdb225; border-left: 3dp #90ddc5; padding-left: 13dp; } -.record .cell { flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; padding-right: 10dp; font-size: 13dp; color: #a9c0cf; } -.record .cell:first-child { flex: 2; font-size: 14dp; color: #e2edf3; display: flex; align-items: center; } +.record { display: flex; align-items: center; width: 100%; min-height: 49dp; padding: 9dp 16dp; border: 0; border-bottom: 1dp var(--divider); border-radius: 0; background-color: transparent; decorator: none; text-align: left; } +.record:hover { background-color: var(--hover); } +.record.selected { background-color: var(--selected); border-left: 3dp var(--accent); padding-left: 13dp; } +.record .cell { flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; padding-right: 10dp; font-size: 13dp; color: var(--muted); } +.record .cell:first-child { flex: 2; font-size: 14dp; color: var(--text); display: flex; align-items: center; } +.record.selected .cell { color: var(--selected-text); } .mini-logo { width: 27dp; height: 27dp; margin-right: 12dp; flex-shrink: 0; } -.inspector { width: 370dp; flex-shrink: 0; border: 1dp #9db7cb23; border-radius: 12dp; background-color: #1c2d4088; display: flex; flex-direction: column; overflow: hidden; } -.inspector-head { padding: 22dp; border-bottom: 1dp #91aabd22; display: flex; align-items: center; flex-shrink: 0; } +.inspector { width: 370dp; flex-shrink: 0; border: 1dp var(--border); border-radius: 12dp; background-color: var(--panel); display: flex; flex-direction: column; overflow: hidden; } +.inspector-head { padding: 22dp; border-bottom: 1dp var(--divider); display: flex; align-items: center; flex-shrink: 0; } .hero-image { width: 70dp; height: 70dp; margin-right: 16dp; } .inspector-head h2 { font-size: 19dp; } .inspector-head small { font-size: 10dp; margin-top: 7dp; } .inspector-scroll { flex: 1; overflow-y: auto; padding: 20dp 22dp; } .form-field { margin-bottom: 15dp; } -.form-field label { display: block; font-size: 12dp; color: #a7bdca; margin-bottom: 6dp; } +.form-field label { display: block; font-size: 12dp; color: var(--muted); margin-bottom: 6dp; } .form-field input, .form-field select, .form-field textarea { width: 100%; } textarea { height: 110dp; font-size: 12dp; line-height: 1.5; } -.form-section { padding-top: 8dp; margin-bottom: 15dp; font-size: 12dp; font-weight: bold; color: #80cfb5; } -.form-help { font-size: 11dp; color: #8da8b9; line-height: 1.5; margin-top: 6dp; } -.inspector-actions { padding: 16dp 20dp; border-top: 1dp #91aabd22; display: flex; gap: 8dp; flex-shrink: 0; } +.form-section { padding-top: 8dp; margin-bottom: 15dp; font-size: 12dp; font-weight: bold; color: var(--accent); } +.form-help { font-size: 11dp; color: var(--muted); line-height: 1.5; margin-top: 6dp; } +.inspector-actions { padding: 16dp 20dp; border-top: 1dp var(--divider); display: flex; gap: 8dp; flex-shrink: 0; } .inspector-actions button { flex: 1; } -.empty { margin: auto; padding: 45dp; text-align: center; color: #8fa8b9; line-height: 1.7; } -#pagination { display: flex; justify-content: space-between; align-items: center; flex-shrink: 0; padding-top: 14dp; color: #97b1c2; font-size: 12dp; } -footer { height: 57dp; padding: 0 28dp; display: flex; align-items: center; gap: 20dp; flex-shrink: 0; border-top: 1dp #ffffff18; background-color: #122033; font-size: 12dp; } -#state { width: 210dp; color: #9dcab9; } -#status-message { flex: 1; color: #9aafbd; } +.empty { margin: auto; padding: 45dp; text-align: center; color: var(--muted); line-height: 1.7; } +#pagination { display: flex; justify-content: space-between; align-items: center; flex-shrink: 0; padding-top: 14dp; color: var(--muted); font-size: 12dp; } +footer { height: 57dp; padding: 0 28dp; display: flex; align-items: center; gap: 20dp; flex-shrink: 0; border-top: 1dp var(--divider); background-color: var(--sidebar); font-size: 12dp; } +#state { width: 210dp; color: var(--positive); } +#status-message { flex: 1; color: var(--muted); } #bottom-actions button { font-size: 12dp; padding: 7dp 11dp; } .dashboard { width: 100%; overflow-y: auto; padding-right: 7dp; } -.hero { padding: 32dp; border: 1dp #9db7cb26; border-radius: 16dp; background-color: #1d3447; margin-bottom: 22dp; } +.hero { padding: 32dp; border: 1dp var(--border); border-radius: 16dp; background-color: var(--wash); margin-bottom: 22dp; } .hero h1 { font-size: 32dp; margin: 0 0 12dp; } -.hero p { color: #afc5d1; line-height: 1.6; max-width: 700dp; margin-bottom: 23dp; } +.hero p { color: var(--muted); line-height: 1.6; max-width: 700dp; margin-bottom: 23dp; } .metrics { display: flex; flex-wrap: wrap; gap: 14dp; } -.metric { width: 23%; flex-grow: 1; min-width: 180dp; min-height: 106dp; padding: 20dp; border: 1dp #9db7cb28; border-radius: 12dp; background-color: #1b2c3e; text-align: left; } -.metric span { display: block; font-size: 28dp; font-weight: bold; color: #e4f4ee; margin-top: 9dp; } -.note { margin-top: 22dp; padding: 18dp 20dp; background-color: #9cba6a0e; border: 1dp #b1c68730; border-radius: 10dp; color: #b4c4b9; font-size: 13dp; line-height: 1.6; } -.source-json { font-size: 11dp; line-height: 1.5; white-space: pre-wrap; color: #98b1c3; margin: 14dp 0; } -.history-row, .diagnostic { padding: 15dp 20dp; border-bottom: 1dp #9db7cb22; line-height: 1.6; } -.diagnostic.error { color: #edaaa6; } -.diagnostic.warning { color: #c8c19a; } -.badge { display: inline-block; font-size: 11dp; border: 1dp #7acfa83d; color: #9cdbb7; border-radius: 5dp; padding: 3dp 6dp; } -#overlay { display: none; position: absolute; left: 0; top: 0; width: 100%; height: 100%; background-color: #050c17b3; align-items: center; justify-content: center; } -#modal { width: 620dp; max-height: 91%; padding: 27dp; border: 1dp #9db7cb55; border-radius: 18dp; background-color: #1c2c40; display: flex; flex-direction: column; } +.metric { width: 23%; flex-grow: 1; min-width: 180dp; min-height: 106dp; padding: 20dp; border: 1dp var(--border); border-radius: 12dp; background-color: var(--panel); decorator: none; text-align: left; } +.metric span { display: block; font-size: 28dp; font-weight: bold; color: var(--text); margin-top: 9dp; } +.note { margin-top: 22dp; padding: 18dp 20dp; background-color: var(--note); border: 1dp var(--accent-border); border-radius: 10dp; color: var(--positive); font-size: 13dp; line-height: 1.6; } +.source-json { font-size: 11dp; line-height: 1.5; white-space: pre-wrap; color: var(--muted); margin: 14dp 0; } +.history-row, .diagnostic { padding: 15dp 20dp; border-bottom: 1dp var(--divider); line-height: 1.6; } +.diagnostic.error { color: var(--danger); } +.diagnostic.warning { color: var(--warning); } +.badge { display: inline-block; font-size: 11dp; border: 1dp var(--accent-border); color: var(--positive); border-radius: 5dp; padding: 3dp 6dp; } +#overlay { display: none; position: absolute; left: 0; top: 0; width: 100%; height: 100%; background-color: var(--overlay); align-items: center; justify-content: center; } +#modal { width: 620dp; max-height: 91%; padding: 27dp; border: 1dp var(--border); border-radius: 18dp; background-color: var(--modal); display: flex; flex-direction: column; } #modal.wide { width: 880dp; } .modal-head { display: flex; justify-content: space-between; align-items: center; margin-bottom: 22dp; flex-shrink: 0; } -.close { padding: 0 7dp; background-color: transparent; border-color: transparent; font-size: 25dp; } +.close { padding: 0 7dp; background-color: transparent; decorator: none; border-color: transparent; font-size: 25dp; } #modal-content { overflow-y: auto; line-height: 1.6; } #modal-buttons { margin-top: 23dp; display: flex; justify-content: flex-end; gap: 9dp; flex-shrink: 0; } -#modal-error { color: #f0aaa7; font-size: 13dp; margin-top: 10dp; } +#modal-error { color: var(--danger); font-size: 13dp; margin-top: 10dp; } .image-layout { display: flex; gap: 24dp; } -.image-stage { flex: 1; min-height: 360dp; background-color: #101b2b; border: 1dp #9db7cb33; border-radius: 10dp; display: flex; align-items: center; justify-content: center; overflow: hidden; } +.image-stage { flex: 1; min-height: 360dp; background-color: var(--image-stage); border: 1dp var(--border); border-radius: 10dp; display: flex; align-items: center; justify-content: center; overflow: hidden; } #crop-canvas { position: relative; } #edit-preview { display: block; } -#crop-box { position: absolute; border: 2dp #a6e8d5; background-color: #a6e8d512; pointer-events: none; } +#crop-box { position: absolute; border: 2dp var(--crop); background-color: var(--crop-wash); pointer-events: none; } .image-controls { width: 215dp; } .pair { display: flex; gap: 8dp; } .pair .form-field { flex: 1; min-width: 0; } .check-label { display: flex; align-items: center; gap: 10dp; font-size: 14dp; margin: 14dp 0; } scrollbarvertical { width: 7dp; margin: 3dp; } scrollbarvertical slidertrack { background-color: transparent; } -scrollbarvertical sliderbar { background-color: #93aabd55; border-radius: 4dp; min-height: 30dp; } +scrollbarvertical sliderbar { background-color: var(--scrollbar); border-radius: 4dp; min-height: 30dp; } +scrollbarvertical sliderbar:hover { background-color: var(--scrollbar-hover); } scrollbarvertical sliderarrowdec, scrollbarvertical sliderarrowinc { height: 0; } -/* These are semantic theme overrides, including dialogs, inputs and lists. */ -body.silver { color: #25394a; background-color: #e7eef3; } -.silver header, .silver aside, .silver footer { background-color: #dbe5ec; border-color: #26465c20; } -.silver h2 span, .silver small, .silver .eyebrow, .silver #page-subtitle, .silver #status-message, .silver #pagination { color: #577081; } -.silver #world-caption, .silver .record .cell, .silver .form-field label { color: #476274; } -.silver button { color: #2c475b; background-color: #ffffff60; border-color: #496d8b38; } -.silver button:hover { background-color: #ffffffdd; } -.silver button.primary { background-color: #276982; color: #ffffff; border-color: #276982; } -.silver .nav { background-color: transparent; border-color: transparent; } -.silver .nav.selected { color: #215e78; background-color: #4c88a12a; border-color: #4c88a13a; } -.silver .nav .glyph, .silver .form-section { color: #326f87; } -.silver input, .silver select, .silver textarea { background-color: #f8fbfd; color: #223d4e; border-color: #5779934a; } -.silver select selectbox { background-color: #f1f6f9; color: #223d4e; } -.silver .list-panel, .silver .inspector { background-color: #f7fafb99; border-color: #55718730; } -.silver .record { background-color: transparent; border-color: #55718715; } -.silver .record .cell:first-child, .silver .metric span { color: #233f50; } -.silver .record.selected { background-color: #4c88a126; border-left-color: #326f87; } -.silver .table-header { background-color: #cad9e366; } -.silver .table-header button { color: #4c687a; } -.silver .table-header button, .silver button.quiet { background-color: transparent; border-color: transparent; } -.silver .brand-mark { color: #276982; border-color: #27698255; } -.silver .brand-mark span { color: #365568; } -.silver .hero, .silver .metric { background-color: #f4f8fb; border-color: #567b9630; } -.silver .hero p, .silver .empty, .silver .source-json, .silver .form-help { color: #577486; } -.silver .note { background-color: #3d806b0c; border-color: #4a826233; color: #46634f; } -.silver #modal { background-color: #eaf0f5; border-color: #849eaf; } -.silver .image-stage { background-color: #d0dce6; } -.silver .badge, .silver #state { color: #3c775a; } -body.matchday { background-color: #222328; color: #efe9e8; } -.matchday header, .matchday aside, .matchday footer { background-color: #2c2b30; } -.matchday .brand-mark { color: #efb2aa; background-color: #efb2aa0e; border-color: #efb2aa55; } -.matchday button.primary { background-color: #efb2aa; border-color: #efb2aa; color: #362a2b; } -.matchday .nav.selected { background-color: #efb2aa16; color: #efb2aa; border-color: #efb2aa30; } -.matchday .nav.selected .glyph, .matchday .form-section { color: #efb2aa; } -.matchday .list-panel, .matchday .inspector { background-color: #33323988; } -.matchday .record.selected { background-color: #efb2aa18; border-left-color: #efb2aa; } -.matchday input, .matchday select, .matchday textarea { background-color: #26262d; border-color: #a5a1b244; } -.matchday select selectbox { background-color: #35343d; } -.matchday .hero, .matchday .metric { background-color: #333238; } -.matchday #modal { background-color: #333238; } -.matchday #state, .matchday .badge { color: #efb2aa; } -.matchday .image-stage { background-color: #23232b; } +button:focus, input:focus, select:focus, textarea:focus { border-color: var(--focus); } +.nav:focus { border-color: var(--focus); } diff --git a/docs/EDITOR.md b/docs/EDITOR.md index 2924236..b5f102a 100644 --- a/docs/EDITOR.md +++ b/docs/EDITOR.md @@ -29,6 +29,14 @@ Shortcuts: Ctrl/Cmd+O, Ctrl/Cmd+S, Shift+Ctrl/Cmd+S, Ctrl/Cmd+Z und Shift+Ctrl/C **Optionen** bietet Deutsch/Englisch, Midnight Glass/Silver Glass/Matchday und den integrierten MCP-Server. Die Sprache ändert die Oberfläche; Namen und Quelldaten werden nicht übersetzt. Einstellungen werden im Benutzerprofil gespeichert. +Unter **Darstellung** stehen die drei Farbwelten der modernen Untermenüs zur Auswahl: + +- **Midnight Glass:** Schiefergrau mit dezenten Mint-Akzenten. +- **Silver Glass:** helle silbergraue Flächen mit Petrol-Akzenten. +- **Matchday:** Graphit mit warmen Korall-Akzenten. + +**Anwenden** wechselt das Theme ohne Neustart. Die Farbwahl gilt auch für Tabellen, Eigenschaften, Dropdowns, Meldungen und die Bildbearbeitung. [Native Vergleichsbilder](qa/editor-poc/README.md#theme-comparison) zeigen alle drei mit denselben synthetischen Daten. + Der MCP-Server ist standardmäßig aktiviert und bindet ausschließlich `127.0.0.1`, standardmäßig Port `8765`. Port `0` wählt einen freien Port. Status und tatsächlicher Port sind in Optionen sichtbar. **Verbindung kopieren** kopiert eine JSON-Konfiguration einschließlich Bearer-Token für HTTP-fähige MCP-Clients. Das Token bleibt lokal im Benutzerprofil und wird nur auf ausdrückliches Kopieren/CLI-Anfordern ausgegeben. Ein anderer bereits laufender Editor kann den Standardport belegen; dann einen anderen Port wählen. Implementiert ist [MCP Streamable HTTP 2025-11-25](https://modelcontextprotocol.io/specification/2025-11-25/basic/transports), mit Aushandlung von 2025-06-18; JSON-Antworten, ohne optionale SSE-Sitzungen. Neuere MCP-Versionen werden nicht als unterstützt beworben. Der Server prüft Token, Host und gegebenenfalls Origin. Oberfläche und Agent bearbeiten dieselbe Welt, verwenden dieselbe Validierung und dieselbe Undo-Historie. Für konkurrierende Änderungen `expected_revision` aus `editor_info`/`editor_get` mitsenden. diff --git a/docs/qa/editor-poc/README.md b/docs/qa/editor-poc/README.md index a7ee415..f2b7283 100644 --- a/docs/qa/editor-poc/README.md +++ b/docs/qa/editor-poc/README.md @@ -12,7 +12,26 @@ reviewed image hashes are allowlisted by the public-tree check. | [Squads](roster-matchday-de.png) | Matchday theme, full squads and optional 24-row view | | [Search](gui-search.png) | Actual keyboard input, focus retained across filtering | | [Options](options-midnight-de.png) | Language, theme, integrated MCP toggle/port | -| [Image editor](image-editor-midnight-de.png) | Source-preserving crop, free rotation and mirroring; a simple synthetic vector portrait | +| [Image editor](image-editor-midnight-de.png) | Source-preserving crop, free rotation and mirroring; the demo's geometric SVG crest | + +## Theme comparison + +The three editor palettes follow the modern game's submenu colours. Midnight +uses a slate-grey gradient and restrained mint accents, Silver pale silver-blue +surfaces and petrol accents, and Matchday graphite surfaces and coral accents. +All components consume the inherited palette, including dropdown popups, +validation/error text, scrollbars, image stages and crop outlines. The comparison +uses the same German `World::demo()` view in each theme. + +| Theme | Clubs | Options | Image editor | +|---|---|---|---| +| Midnight Glass | [View](clubs-midnight-de.png) | [View](options-midnight-de.png) | [View](image-editor-midnight-de.png) | +| Silver Glass | [View](clubs-silver-de.png) | [View](options-silver-de.png) | [View](image-editor-silver-de.png) | +| Matchday | [View](clubs-matchday-de.png) | [View](options-matchday-de.png) | [View](image-editor-matchday-de.png) | + +[Previous Midnight view](https://github.com/Weyoune/openbmh/blob/fcf6092063c2354dec400462d5fa0c7dda3afe11/docs/qa/editor-poc/clubs-midnight-de.png) +provides the before image for the change from saturated navy to the submenu +palette. Data and layout are identical. Environment: Debian 13 x86-64; actual SDL2/OpenGL/RmlUI window inside Xvfb, software OpenGL requested with `LIBGL_ALWAYS_SOFTWARE=1`; 1440×900 window. @@ -31,6 +50,13 @@ Validation performed: JSON colour field retained; native search focus; shared MCP/native undo/redo; save to OBW. This check caught and fixed RmlUI textarea entity handling and select-initialization refresh loops. +- Native theme QA: switch Midnight → Silver → Matchday → Midnight through the + actual Options dropdown and Apply button; verify persisted settings and + compare rendered body, list and inspector pixels against a fresh startup + in each theme. Reopen the editor using the saved preference. Inspect the + Options popup, rejected invalid port input, dashboard, players, review, + history and image editor in each palette. The rejected input leaves the + saved options unchanged. No new platform GUI claim is implied. - Private local checks, whose data is not published here: raw BMH and raw Football Limited import, existing converted Classic OBWs, save/reopen, frozen Classic portrait composition, and the large private merged 32-league world. @@ -46,9 +72,10 @@ OpenBMHEditor --demo --page clubs --screenshot clubs.png --quit-after-ms 1800 ``` The synthetic data is generated by `World::demo()`, not a career save. Options -files used for captures are local QA profiles and are not included. The vector -portrait uses a blue rectangle, a circular head and a rounded shoulder shape; -it is an image-editor fixture, not a real or AI-generated player. +files used for captures are local QA profiles and are not included. The image +editor captures use the demo's geometric SVG crest. Earlier history also +contains a synthetic portrait made from a blue rectangle, circular head and +rounded shoulders; no real or AI-generated player photo is used. Windows x64/macOS ARM64 build and core/MCP checks are run by the separate **OBW Editor POC** workflow. A CI pass is not a human GUI acceptance test on diff --git a/docs/qa/editor-poc/clubs-matchday-de.png b/docs/qa/editor-poc/clubs-matchday-de.png new file mode 100644 index 0000000..be7a224 Binary files /dev/null and b/docs/qa/editor-poc/clubs-matchday-de.png differ diff --git a/docs/qa/editor-poc/clubs-midnight-de.png b/docs/qa/editor-poc/clubs-midnight-de.png index acaef81..95e2b14 100644 Binary files a/docs/qa/editor-poc/clubs-midnight-de.png and b/docs/qa/editor-poc/clubs-midnight-de.png differ diff --git a/docs/qa/editor-poc/clubs-silver-de.png b/docs/qa/editor-poc/clubs-silver-de.png new file mode 100644 index 0000000..c51bae9 Binary files /dev/null and b/docs/qa/editor-poc/clubs-silver-de.png differ diff --git a/docs/qa/editor-poc/gui-search.png b/docs/qa/editor-poc/gui-search.png index 11dfd95..b436d99 100644 Binary files a/docs/qa/editor-poc/gui-search.png and b/docs/qa/editor-poc/gui-search.png differ diff --git a/docs/qa/editor-poc/image-editor-matchday-de.png b/docs/qa/editor-poc/image-editor-matchday-de.png new file mode 100644 index 0000000..7a93441 Binary files /dev/null and b/docs/qa/editor-poc/image-editor-matchday-de.png differ diff --git a/docs/qa/editor-poc/image-editor-midnight-de.png b/docs/qa/editor-poc/image-editor-midnight-de.png index 33b6278..6b367ad 100644 Binary files a/docs/qa/editor-poc/image-editor-midnight-de.png and b/docs/qa/editor-poc/image-editor-midnight-de.png differ diff --git a/docs/qa/editor-poc/image-editor-silver-de.png b/docs/qa/editor-poc/image-editor-silver-de.png new file mode 100644 index 0000000..edcb3ce Binary files /dev/null and b/docs/qa/editor-poc/image-editor-silver-de.png differ diff --git a/docs/qa/editor-poc/options-matchday-de.png b/docs/qa/editor-poc/options-matchday-de.png new file mode 100644 index 0000000..3bf435c Binary files /dev/null and b/docs/qa/editor-poc/options-matchday-de.png differ diff --git a/docs/qa/editor-poc/options-midnight-de.png b/docs/qa/editor-poc/options-midnight-de.png index 0d9c30e..a87b397 100644 Binary files a/docs/qa/editor-poc/options-midnight-de.png and b/docs/qa/editor-poc/options-midnight-de.png differ diff --git a/docs/qa/editor-poc/options-silver-de.png b/docs/qa/editor-poc/options-silver-de.png new file mode 100644 index 0000000..8ff4119 Binary files /dev/null and b/docs/qa/editor-poc/options-silver-de.png differ diff --git a/docs/qa/editor-poc/players-silver-en.png b/docs/qa/editor-poc/players-silver-en.png index 4056e48..2b3dadc 100644 Binary files a/docs/qa/editor-poc/players-silver-en.png and b/docs/qa/editor-poc/players-silver-en.png differ diff --git a/docs/qa/editor-poc/roster-matchday-de.png b/docs/qa/editor-poc/roster-matchday-de.png index fdee936..36f5ded 100644 Binary files a/docs/qa/editor-poc/roster-matchday-de.png and b/docs/qa/editor-poc/roster-matchday-de.png differ diff --git a/src/editor/ui.cpp b/src/editor/ui.cpp index 0f0586b..2006233 100644 --- a/src/editor/ui.cpp +++ b/src/editor/ui.cpp @@ -209,9 +209,13 @@ class EditorUi final : public Rml::EventListener { {"assets", "M3 3h18v18H3zM3 18l6-7 5 5 3-3 4 5M17 6v2"}, {"review", "M12 2 1 21h22zM12 8v6M12 17v1"}, {"changes", "M4 5v6h6M4 11a9 9 0 1 1 1 7"}}; - const auto token = "icon-" + options_.theme + '-' + name + ".png"; + const bool active = name == page_; + const auto token = "icon-" + options_.theme + '-' + name + (active ? "-active.png" : ".png"); if (!renderer_.memory.contains(token)) { - auto color = options_.theme == "silver" ? "#537588" : options_.theme == "matchday" ? "#d3b3b0" : "#9cb9c8"; + // Rasterized line art follows the same muted/accent colours as RCSS. + const auto color = options_.theme == "silver" ? (active ? "#25617a" : "#526779") + : options_.theme == "matchday" ? (active ? "#efb2aa" : "#b7b4b9") + : (active ? "#a9dccb" : "#a8b8c8"); renderer_.memory[token] = {"