From 1114e566d94d2be36f9d0351c31f3b07b0d3ba39 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sat, 27 Jan 2024 13:36:28 -0300 Subject: [PATCH] style: Update month border colors Use a defined color for that, and make them more in line with the Adwaita style. --- src/theme/style-dark.css | 28 ++-------------------------- src/theme/style-hc-dark.css | 26 +------------------------- src/theme/style-hc.css | 28 +++------------------------- src/theme/style.css | 8 +++++--- 4 files changed, 11 insertions(+), 79 deletions(-) diff --git a/src/theme/style-dark.css b/src/theme/style-dark.css index 0fd9cdc9..135c0955 100644 --- a/src/theme/style-dark.css +++ b/src/theme/style-dark.css @@ -1,3 +1,5 @@ +@define-color month_border_color mix(@borders, @light_5, 0.14); + /* * Event widget */ @@ -40,29 +42,3 @@ monthcell:not(.workday):selected:hover { background-color: alpha(@accent_bg_color, 0.2); transition: background-color 200ms; } - -/* Separators */ -monthcell.separator-top, -monthcell.separator-top:selected { - border-top: 1px solid #6b6b6b; -} - -monthcell.separator-side:dir(ltr), -monthcell.separator-side:selected:dir(ltr) { - border-left: 1px solid #6b6b6b; -} - -monthcell:nth-child(7n + 1):dir(ltr), -monthcell:nth-child(7n + 1):selected:dir(ltr) { - border-left-width: 0; -} - -monthcell.separator-side:dir(rtl), -monthcell.separator-side:selected:dir(rtl) { - border-right: 1px solid #6b6b6b; -} - -monthcell:nth-child(7n + 1):dir(rtl), -monthcell:nth-child(7n + 1):selected:dir(rtl) { - border-right-width: 0; -} diff --git a/src/theme/style-hc-dark.css b/src/theme/style-hc-dark.css index e3ca8362..49bf5e18 100644 --- a/src/theme/style-hc-dark.css +++ b/src/theme/style-hc-dark.css @@ -1,25 +1 @@ -/* Separators */ -monthcell.separator-top, -monthcell.separator-top:selected { - border-top: 1px solid white; -} - -monthcell.separator-side:dir(ltr), -monthcell.separator-side:selected:dir(ltr) { - border-left: 1px solid white; -} - -monthcell:nth-child(7n + 1):dir(ltr), -monthcell:nth-child(7n + 1):selected:dir(ltr) { - border-left-width: 0; -} - -monthcell.separator-side:dir(rtl), -monthcell.separator-side:selected:dir(rtl) { - border-right: 1px solid white; -} - -monthcell:nth-child(7n + 1):dir(rtl), -monthcell:nth-child(7n + 1):selected:dir(rtl) { - border-right-width: 0; -} +@define-color month_border_color white; diff --git a/src/theme/style-hc.css b/src/theme/style-hc.css index 232a233e..40b6c522 100644 --- a/src/theme/style-hc.css +++ b/src/theme/style-hc.css @@ -1,35 +1,13 @@ +@define-color month_border_color black; + .sources-button > button:hover, .sources-button > button:active, .sources-button > button:checked { box-shadow: inset 1px 0 @borders, inset -1px 0 @borders; } -datechooser .weeknum{ +datechooser .weeknum { color: @theme_fg_color; background-color: alpha(@theme_fg_color, 0.05); border: 1px solid alpha(currentColor, 0.5); } -monthcell.separator-top, -monthcell.separator-top:selected { - border-top: 1px solid black; -} - -monthcell.separator-side:dir(ltr), -monthcell.separator-side:selected:dir(ltr) { - border-left: 1px solid black; -} - -monthcell:nth-child(7n + 1):dir(ltr), -monthcell:nth-child(7n + 1):selected:dir(ltr) { - border-left-width: 0; -} - -monthcell.separator-side:dir(rtl), -monthcell.separator-side:selected:dir(rtl) { - border-right: 1px solid black; -} - -monthcell:nth-child(7n + 1):dir(rtl), -monthcell:nth-child(7n + 1):selected:dir(rtl) { - border-right-width: 0; -} diff --git a/src/theme/style.css b/src/theme/style.css index 6e996eaf..666bf984 100644 --- a/src/theme/style.css +++ b/src/theme/style.css @@ -1,3 +1,5 @@ +@define-color month_border_color mix(@borders, @dark_5, 0.09); + /* Header labels */ label.primary-label { font-size: 16pt; @@ -397,12 +399,12 @@ monthcell button { /* Separators */ monthcell.separator-top, monthcell.separator-top:selected { - border-top: 1px solid #a4a4a4; + border-top: 1px solid @month_border_color; } monthcell.separator-side:dir(ltr), monthcell.separator-side:selected:dir(ltr) { - border-left: 1px solid #a4a4a4; + border-left: 1px solid @month_border_color; } monthcell:nth-child(7n + 1):dir(ltr), @@ -412,7 +414,7 @@ monthcell:nth-child(7n + 1):selected:dir(ltr) { monthcell.separator-side:dir(rtl), monthcell.separator-side:selected:dir(rtl) { - border-right: 1px solid #a4a4a4; + border-right: 1px solid @month_border_color; } monthcell:nth-child(7n + 1):dir(rtl),