From b0321c369de41bda638d311999bb84af876574bd Mon Sep 17 00:00:00 2001
From: Jake Dane <jakedane@mailcan.com>
Date: Wed, 8 Apr 2026 12:19:18 +0000
Subject: [PATCH] Replace style-*.css with media queries

Libadwaita 1.9 deprecates using style-dark.css, style-hc-dark.css and
style-hc.css. This moves these styles into style.css and conditionally
loads them using media queries.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/745>
---
 src/theme/style-dark.css      |  8 --------
 src/theme/style-hc-dark.css   |  0
 src/theme/style-hc.css        |  9 ---------
 src/theme/style.css           | 20 ++++++++++++++++++++
 src/theme/theme.gresource.xml |  3 ---
 5 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 src/theme/style-dark.css
 delete mode 100644 src/theme/style-hc-dark.css
 delete mode 100644 src/theme/style-hc.css

diff --git a/src/theme/style-dark.css b/src/theme/style-dark.css
deleted file mode 100644
index 965ebfd1..00000000
--- a/src/theme/style-dark.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Search
- */
-
-searchbutton > popover listview > row:selected {
-  background-color: rgb(from var(--accent-bg-color) r g b / 20%);
-}
-
diff --git a/src/theme/style-hc-dark.css b/src/theme/style-hc-dark.css
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/theme/style-hc.css b/src/theme/style-hc.css
deleted file mode 100644
index 8d30a042..00000000
--- a/src/theme/style-hc.css
+++ /dev/null
@@ -1,9 +0,0 @@
-datechooser .weeknum {
-  --border-width: 1px;
-  --base-color: var(--window-fg-color);
-}
-
-calendar-view.month-view {
-  --raised-shade-color: var(--border-color);
-  --raised-shade-color-base: transparent;
-}
diff --git a/src/theme/style.css b/src/theme/style.css
index ecf51e1a..a119e377 100644
--- a/src/theme/style.css
+++ b/src/theme/style.css
@@ -142,6 +142,13 @@ datechooser .weeknum {
   background-color: rgb(from var(--base-color) r g b / 5%);
   color: var(--base-color);
 }
+/* high contrast */
+@media (prefers-contrast: more) {
+  datechooser .weeknum {
+    --border-width: 1px;
+    --base-color: var(--window-fg-color);
+  }
+}
 
 /* day names */
 datechooser .weekday {
@@ -377,6 +384,13 @@ calendar-view.month-view {
     inset 0 -1px var(--raised-shade-color, var(--raised-shade-color-base)),
     inset 0 -2px 4px var(--raised-shade-color-base);
 }
+/* high contrast */
+@media (prefers-contrast: more) {
+  calendar-view.month-view {
+    --raised-shade-color: var(--border-color);
+    --raised-shade-color-base: transparent;
+  }
+}
 
 calendar-view.month-view > box.month-header {
   padding-bottom: 6px;
@@ -443,6 +457,12 @@ searchbutton > popover > arrow {
 searchbutton > popover listview > row:selected {
   background-color: rgb(from var(--accent-bg-color) r g b / 11%);
 }
+/* dark mode */
+@media (prefers-color-scheme: dark) {
+  searchbutton > popover listview > row:selected {
+    background-color: rgb(from var(--accent-bg-color) r g b / 20%);
+  }
+}
 
 /*
  * Month selector
diff --git a/src/theme/theme.gresource.xml b/src/theme/theme.gresource.xml
index de0ae233..a786526a 100644
--- a/src/theme/theme.gresource.xml
+++ b/src/theme/theme.gresource.xml
@@ -3,8 +3,5 @@
   <gresource prefix="/org/gnome/calendar">
     <file>events.css</file>
     <file>style.css</file>
-    <file>style-dark.css</file>
-    <file>style-hc.css</file>
-    <file>style-hc-dark.css</file>
   </gresource>
 </gresources>