From 0de4a7e0214d314b9d521db208e1868eddfdaa72 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Thu, 11 Apr 2024 11:13:39 +0530 Subject: [PATCH 1/9] some css tweaks for accessibility --- data/themes/default/style.css | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 89c14f20a2a..f04f00744f3 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -40,6 +40,11 @@ QMdiArea { background-color: #111314; } +QPushButton:focus { + border: 1px solid lightgreen; + border-radius: 4px; +} + lmms--gui--FileBrowser QCheckBox { font-size: 8pt; @@ -278,33 +283,33 @@ QScrollBar::add-page:vertical:pressed, QScrollBar::sub-page:vertical:pressed { /* scrollbar: handles (sliders) */ QScrollBar::handle:horizontal { - background: #3f4750; + background: rgb(183, 217, 195); border: none; border-radius: 4px; min-width: 24px; } QScrollBar::handle:horizontal:hover { - background: #525e69; + background: #cff3e4; } QScrollBar::handle:horizontal:pressed { - background: rgba(11,213,86,100); + border: 1px solid #557165; } QScrollBar::handle:vertical { - background: #3f4750; + background: rgb(183, 217, 195); border: none; border-radius: 4px; min-height: 24px; } QScrollBar::handle:vertical:hover { - background: #525e69; + background: #cff3e4; } QScrollBar::handle:vertical:pressed { - background: rgba(11,213,86,100); + border: 1px solid #557165; } QScrollBar::handle:horizontal:disabled, QScrollBar::handle:vertical:disabled { @@ -539,6 +544,12 @@ QToolButton:hover { background: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 #7c8799, stop:1 #343840) } +QToolButton:hover:checked { + border: 2px solid #343840; + border-radius: 2px; + background: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 #292d33, stop:1 #22262c) +} + QToolButton:pressed { border-top: 1px solid #778394; border-bottom: 1px solid #1e2226; From da455e966753e575180a9fbb92528affe1489695 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 13 Apr 2024 12:29:10 +0530 Subject: [PATCH 2/9] suggestions from review --- data/themes/default/style.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/themes/default/style.css b/data/themes/default/style.css index f04f00744f3..b683cde6b40 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -41,7 +41,7 @@ QMdiArea { } QPushButton:focus { - border: 1px solid lightgreen; + border: 1px solid #d1d8e4; border-radius: 4px; } @@ -283,33 +283,33 @@ QScrollBar::add-page:vertical:pressed, QScrollBar::sub-page:vertical:pressed { /* scrollbar: handles (sliders) */ QScrollBar::handle:horizontal { - background: rgb(183, 217, 195); + background: #d1d8e4; border: none; border-radius: 4px; min-width: 24px; } QScrollBar::handle:horizontal:hover { - background: #cff3e4; + background: #1de276; } QScrollBar::handle:horizontal:pressed { - border: 1px solid #557165; + border: 2px solid #d1d8e4; } QScrollBar::handle:vertical { - background: rgb(183, 217, 195); + background: #d1d8e4; border: none; border-radius: 4px; min-height: 24px; } QScrollBar::handle:vertical:hover { - background: #cff3e4; + background: #1de276; } QScrollBar::handle:vertical:pressed { - border: 1px solid #557165; + border: 2px solid #d1d8e4; } QScrollBar::handle:horizontal:disabled, QScrollBar::handle:vertical:disabled { From 3fcd1a695155ca26d47ba6e57fa950a186098f3d Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 13 Apr 2024 12:48:39 +0530 Subject: [PATCH 3/9] classic theme focus --- data/themes/classic/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css index 08a04f01df7..87d0eca474e 100644 --- a/data/themes/classic/style.css +++ b/data/themes/classic/style.css @@ -11,6 +11,10 @@ QMdiArea { background-image: url("resources:background_artwork.png"); } +QPushButton:focus{ + border: 2px solid #000; +} + lmms--gui--Knob { qproperty-lineInactiveColor: rgb(120, 120, 120); qproperty-arcInactiveColor: rgba(120, 120, 120, 70); From 0ddbc241b7740a9ba7477145711c112d7cd9c770 Mon Sep 17 00:00:00 2001 From: Ross maxx Date: Sat, 13 Apr 2024 12:53:39 +0530 Subject: [PATCH 4/9] fix bug where button color disappears on focus --- data/themes/classic/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css index 87d0eca474e..d5270fe675c 100644 --- a/data/themes/classic/style.css +++ b/data/themes/classic/style.css @@ -13,6 +13,7 @@ QMdiArea { QPushButton:focus{ border: 2px solid #000; + background-color: #c9c9c9; } lmms--gui--Knob { From 2fb71cc8042402bca13985e634beb36d4680ad41 Mon Sep 17 00:00:00 2001 From: Rossmaxx <74815851+Rossmaxx@users.noreply.github.com> Date: Sun, 14 Apr 2024 19:56:35 +0530 Subject: [PATCH 5/9] More scrollbar color changes on hover. --- data/themes/default/style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/themes/default/style.css b/data/themes/default/style.css index b683cde6b40..465ffd28819 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -290,11 +290,11 @@ QScrollBar::handle:horizontal { } QScrollBar::handle:horizontal:hover { - background: #1de276; + border: 2px solid #000000; } QScrollBar::handle:horizontal:pressed { - border: 2px solid #d1d8e4; + background: #ffffff; } QScrollBar::handle:vertical { @@ -305,11 +305,11 @@ QScrollBar::handle:vertical { } QScrollBar::handle:vertical:hover { - background: #1de276; + border: 2px solid #000000; } QScrollBar::handle:vertical:pressed { - border: 2px solid #d1d8e4; + background: #ffffff; } QScrollBar::handle:horizontal:disabled, QScrollBar::handle:vertical:disabled { From 0ebfeb222d9d2b01a4b34c96ada3ea6f6127c96b Mon Sep 17 00:00:00 2001 From: Rossmaxx <74815851+Rossmaxx@users.noreply.github.com> Date: Mon, 15 Apr 2024 05:08:37 +0530 Subject: [PATCH 6/9] Commented the hover effect for now. --- data/themes/default/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 465ffd28819..ce523acca16 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -290,7 +290,7 @@ QScrollBar::handle:horizontal { } QScrollBar::handle:horizontal:hover { - border: 2px solid #000000; + /* border: 2px solid #000000; */ } QScrollBar::handle:horizontal:pressed { @@ -305,7 +305,7 @@ QScrollBar::handle:vertical { } QScrollBar::handle:vertical:hover { - border: 2px solid #000000; + /* border: 2px solid #000000; */ } QScrollBar::handle:vertical:pressed { From 2bb2d1ea1ba3939f2d908348d65d14b60d09a41b Mon Sep 17 00:00:00 2001 From: Rossmaxx <74815851+Rossmaxx@users.noreply.github.com> Date: Mon, 15 Apr 2024 19:55:22 +0530 Subject: [PATCH 7/9] Remove handle "hover" effect. --- data/themes/default/style.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/data/themes/default/style.css b/data/themes/default/style.css index ce523acca16..dc99e5eb172 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -289,10 +289,6 @@ QScrollBar::handle:horizontal { min-width: 24px; } -QScrollBar::handle:horizontal:hover { - /* border: 2px solid #000000; */ -} - QScrollBar::handle:horizontal:pressed { background: #ffffff; } @@ -304,10 +300,6 @@ QScrollBar::handle:vertical { min-height: 24px; } -QScrollBar::handle:vertical:hover { - /* border: 2px solid #000000; */ -} - QScrollBar::handle:vertical:pressed { background: #ffffff; } From 6bef94ef3aafe534e3b2cc0fb9fb7904c225de7d Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Sun, 19 May 2024 16:09:45 +0530 Subject: [PATCH 8/9] scrollbar --- data/themes/default/style.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 71b7aa38ab4..516b320fb6f 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -283,23 +283,31 @@ QScrollBar::add-page:vertical:pressed, QScrollBar::sub-page:vertical:pressed { /* scrollbar: handles (sliders) */ QScrollBar::handle:horizontal { - background: #d1d8e4; + background: #5d6b77; border: none; border-radius: 4px; min-width: 24px; } +QScrollBar::handle:horizontal:hover { + background: #b8c4d1; +} + QScrollBar::handle:horizontal:pressed { background: #ffffff; } QScrollBar::handle:vertical { - background: #d1d8e4; + background: #5d6b77; border: none; border-radius: 4px; min-height: 24px; } +QScrollBar::handle:vertical:hover { + background: #b8c4d1; +} + QScrollBar::handle:vertical:pressed { background: #ffffff; } From ca503ae80820867306eadf2aa1c5e5c518fe7eee Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Sun, 19 May 2024 16:52:12 +0530 Subject: [PATCH 9/9] revert button active state --- data/themes/classic/style.css | 5 ----- data/themes/default/style.css | 5 ----- 2 files changed, 10 deletions(-) diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css index d34dac3e07c..dfaee134dbc 100644 --- a/data/themes/classic/style.css +++ b/data/themes/classic/style.css @@ -11,11 +11,6 @@ QMdiArea { background-image: url("resources:background_artwork.png"); } -QPushButton:focus{ - border: 2px solid #000; - background-color: #c9c9c9; -} - lmms--gui--Knob { qproperty-lineInactiveColor: rgb(120, 120, 120); qproperty-arcInactiveColor: rgba(120, 120, 120, 70); diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 516b320fb6f..de0f5c6a315 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -40,11 +40,6 @@ QMdiArea { background-color: #111314; } -QPushButton:focus { - border: 1px solid #d1d8e4; - border-radius: 4px; -} - lmms--gui--FileBrowser QCheckBox { font-size: 8pt;