From 1ba54adb85edbb9cacc6f0bae0dcca68a8ecf1e2 Mon Sep 17 00:00:00 2001 From: Warchamp7 Date: Sun, 21 Apr 2024 05:26:22 -0400 Subject: [PATCH] UI: Clean up theme file formatting --- UI/data/themes/Yami.obt | 23 +++++++++++------------ UI/data/themes/Yami_Acri.ovt | 2 +- UI/data/themes/Yami_Classic.ovt | 2 +- UI/data/themes/Yami_Rachni.ovt | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/UI/data/themes/Yami.obt b/UI/data/themes/Yami.obt index 642cb203f..f35137a97 100644 --- a/UI/data/themes/Yami.obt +++ b/UI/data/themes/Yami.obt @@ -93,12 +93,12 @@ /* Layout */ /* Configurable Values */ - --font_base_value: 10; // TODO: Min 8, Max 12, Step 1 - --spacing_base_value: 4; // TODO: Min 2, Max 7, Step 1 - --padding_base_value: 4; // TODO: Min 0.25, Max 10, Step 2 + --font_base_value: 10; /* TODO: Min 8, Max 12, Step 1 */ + --spacing_base_value: 4; /* TODO: Min 2, Max 7, Step 1 */ + --padding_base_value: 4; /* TODO: Min 0.25, Max 10, Step 2 */ - --border_highlight: "transparent"; // TODO: Better Accessibility focus state - // TODO: Move Accessibilty Colors to Theme config system + --border_highlight: "transparent"; /* TODO: Better Accessibility focus state */ + /* TODO: Move Accessibilty Colors to Theme config system */ --font_base: calc(1pt * var(--font_base_value)); --font_small: calc(0.9pt * var(--font_base_value)); @@ -184,12 +184,12 @@ --highlight: rgb(42,130,218); --highlight_inactive: rgb(25,28,34); - + /* Qt Palette variables can be set with the "palette_" prefix */ --palette_window: var(--bg_window); --palette_windowText: var(--text); --palette_base: var(--bg_base); - + --palette_light: var(--grey2); --palette_mid: var(--grey7); --palette_dark: var(--grey6); @@ -208,7 +208,7 @@ --palette_text_active: var(--text); --palette_text_disabled: var(--text_disabled); --palette_text_inactive: var(--text_inactive); - + /* * Variables calculated at runtime (after all themes have been composed). * @@ -778,7 +778,6 @@ QTabBar::tab:top:selected { } QTabBar::tab:bottom { - } QTabBar::tab:bottom:selected { @@ -915,7 +914,7 @@ QSpinBox::up-button, QDoubleSpinBox::up-button { subcontrol-origin: padding; subcontrol-position: top right; /* position at the top right corner */ - + width: 32px; border-left: 1px solid var(--grey6); border-bottom: 1px solid transparent; @@ -927,7 +926,7 @@ QSpinBox::down-button, QDoubleSpinBox::down-button { subcontrol-origin: padding; subcontrol-position: bottom right; /* position at the top right corner */ - + width: 32px; border-left: 1px solid var(--grey6); border-top: 1px solid var(--grey6); @@ -1498,7 +1497,7 @@ MuteCheckBox::indicator:unchecked { icon-size: var(--icon_base), var(--icon_base); } -MuteCheckBox::indicator:hover, +MuteCheckBox::indicator:hover, MuteCheckBox::indicator:unchecked:hover { background-color: var(--button_bg_hover); padding: var(--padding_base_border) var(--padding_base_border); diff --git a/UI/data/themes/Yami_Acri.ovt b/UI/data/themes/Yami_Acri.ovt index 2a847e632..e37570480 100644 --- a/UI/data/themes/Yami_Acri.ovt +++ b/UI/data/themes/Yami_Acri.ovt @@ -114,7 +114,7 @@ MuteCheckBox::indicator:focus { border: 1px solid var(--toolbutton_bg); } -MuteCheckBox::indicator:hover, +MuteCheckBox::indicator:hover, MuteCheckBox::indicator:unchecked:hover { background-color: var(--toolbutton_bg_hover); border: 1px solid var(--toolbutton_bg_hover); diff --git a/UI/data/themes/Yami_Classic.ovt b/UI/data/themes/Yami_Classic.ovt index c365f1c3e..ffc6a863b 100644 --- a/UI/data/themes/Yami_Classic.ovt +++ b/UI/data/themes/Yami_Classic.ovt @@ -205,7 +205,7 @@ MuteCheckBox::indicator:unchecked { icon-size: var(--icon_base_mixer), var(--icon_base_mixer); } -MuteCheckBox::indicator:hover, +MuteCheckBox::indicator:hover, MuteCheckBox::indicator:unchecked:hover { icon-size: var(--icon_base_mixer), var(--icon_base_mixer); } diff --git a/UI/data/themes/Yami_Rachni.ovt b/UI/data/themes/Yami_Rachni.ovt index 444cdbe7c..7f6fa4ae0 100644 --- a/UI/data/themes/Yami_Rachni.ovt +++ b/UI/data/themes/Yami_Rachni.ovt @@ -148,7 +148,7 @@ MuteCheckBox::indicator:focus { border: 1px solid var(--toolbutton_bg); } -MuteCheckBox::indicator:hover, +MuteCheckBox::indicator:hover, MuteCheckBox::indicator:unchecked:hover { background-color: var(--toolbutton_bg_hover); border: 1px solid var(--toolbutton_bg_hover);