Skip to content

CSS: GTK4 prep #1089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 1 commit into from
Aug 12, 2026
Merged

CSS: GTK4 prep #1089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion data/application.css → data/Application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
31 changes: 0 additions & 31 deletions data/ConversationListItem.css
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions data/io.elementary.mail.gresource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Application.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 0 additions & 10 deletions src/ConversationList/ConversationListItem.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand All @@ -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,
Expand All @@ -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) {
Expand Down
Loading