From 069a942f9db42d6c663611904386dfe5f94d3640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Wed, 12 Aug 2026 14:31:15 -0700
Subject: [PATCH] CSS: GTK4 prep

---
 data/{application.css => Application.css}     | 34 ++++++++++++++++++-
 data/ConversationListItem.css                 | 31 -----------------
 data/io.elementary.mail.gresource.xml         |  3 +-
 src/Application.vala                          |  2 +-
 .../ConversationListItem.vala                 | 10 ------
 5 files changed, 35 insertions(+), 45 deletions(-)
 rename data/{application.css => Application.css} (51%)
 delete mode 100644 data/ConversationListItem.css

diff --git a/data/application.css b/data/Application.css
similarity index 51%
rename from data/application.css
rename to data/Application.css
index acccbdbbe..6f593dac7 100644
--- a/data/application.css
+++ b/data/Application.css
@@ -15,6 +15,38 @@
     box-shadow: 0 -1px 0 @menu_separator;
 }
 
+affordance {
+    padding: 1em;
+}
+
+affordance.start:dir(ltr),
+affordance.end:dir(rtl) {
+    border-top-left-radius: 0.5em;
+    border-bottom-left-radius: 0.5em;
+
+}
+
+affordance.end:dir(ltr),
+affordance.start:dir(rtl) {
+    border-top-right-radius: 0.5em;
+    border-bottom-right-radius: 0.5em;
+}
+
+affordance label {
+    color: inherit;
+    font-weight: 600;
+}
+
+affordance.archive {
+    background-color: mix(@theme_bg_color, @GRAPE_500, 0.3);
+    color: mix(@theme_fg_color, @GRAPE_500, 0.6);
+}
+
+affordance.trash {
+    background-color: mix(@theme_bg_color, @STRAWBERRY_500, 0.3);
+    color: mix(@theme_fg_color, @error_color, 0.6);
+}
+
 entry button,
 entry entry {
 	border: none;
@@ -33,7 +65,7 @@ entry button:hover label {
 }
 
 entry button:focus {
-    background-color: alpha (@text_color, 0.15);
+    background-color: alpha(@text_color, 0.15);
 }
 
 entry button:checked label {
diff --git a/data/ConversationListItem.css b/data/ConversationListItem.css
deleted file mode 100644
index ee1693edd..000000000
--- a/data/ConversationListItem.css
+++ /dev/null
@@ -1,31 +0,0 @@
-affordance {
-    padding: 1em;
-}
-
-affordance.start:dir(ltr),
-affordance.end:dir(rtl) {
-    border-top-left-radius: 0.5em;
-    border-bottom-left-radius: 0.5em;
-
-}
-
-affordance.end:dir(ltr),
-affordance.start:dir(rtl) {
-    border-top-right-radius: 0.5em;
-    border-bottom-right-radius: 0.5em;
-}
-
-affordance label {
-    color: inherit;
-    font-weight: 600;
-}
-
-affordance.archive {
-    background-color: mix(@theme_bg_color, @GRAPE_500, 0.3);
-    color: mix(@theme_fg_color, @GRAPE_500, 0.6);
-}
-
-affordance.trash {
-    background-color: mix(@theme_bg_color, @STRAWBERRY_500, 0.3);
-    color: mix(@theme_fg_color, @error_color, 0.6);
-}
diff --git a/data/io.elementary.mail.gresource.xml b/data/io.elementary.mail.gresource.xml
index 270c6a42a..1b5174108 100644
--- a/data/io.elementary.mail.gresource.xml
+++ b/data/io.elementary.mail.gresource.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/mail">
-    <file alias="application.css" compressed="true">application.css</file>
+    <file compressed="true">Application.css</file>
     <file alias="blank-editor-template.html" compressed="true">blank-editor-template.html</file>
     <file alias="blank-message-template.html" compressed="true">blank-message-template.html</file>
-    <file alias="ConversationListItem.css" compressed="true">ConversationListItem.css</file>
   </gresource>
   <gresource prefix="/io/elementary/mail/icons">
     <file alias="scalable/places/mail-archive-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/mail-archive/symbolic.svg</file>
diff --git a/src/Application.vala b/src/Application.vala
index a8ce2854c..bf4b2e2dc 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -114,7 +114,7 @@ public class Mail.Application : Gtk.Application {
         });
 
         var css_provider = new Gtk.CssProvider ();
-        css_provider.load_from_resource ("io/elementary/mail/application.css");
+        css_provider.load_from_resource ("io/elementary/mail/Application.css");
         Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         var quit_action = new SimpleAction ("quit", null);
diff --git a/src/ConversationList/ConversationListItem.vala b/src/ConversationList/ConversationListItem.vala
index 9d0cff4ae..3b495dd65 100644
--- a/src/ConversationList/ConversationListItem.vala
+++ b/src/ConversationList/ConversationListItem.vala
@@ -241,13 +241,6 @@ public class Mail.ConversationListItem : VirtualizingListBoxRow {
         public string icon_name { get; construct; }
         public string label { get; construct; }
 
-        private static Gtk.CssProvider provider;
-
-        static construct {
-            provider = new Gtk.CssProvider ();
-            provider.load_from_resource ("io/elementary/mail/ConversationListItem.css");
-        }
-
         class construct {
             set_css_name ("affordance");
         }
@@ -265,7 +258,6 @@ public class Mail.ConversationListItem : VirtualizingListBoxRow {
 
             var label = new Gtk.Label (label);
             label.get_style_context ().add_class (Granite.STYLE_CLASS_SMALL_LABEL);
-            label.get_style_context ().add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
             var box = new Gtk.Box (VERTICAL, 3) {
                 halign = alignment,
@@ -278,8 +270,6 @@ public class Mail.ConversationListItem : VirtualizingListBoxRow {
 
             add (box);
 
-            get_style_context ().add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-
             if (alignment == Gtk.Align.START) {
                 get_style_context ().add_class ("start");
             } else if (alignment == Gtk.Align.END) {