Skip to content

Commit

Permalink
libadwaita/patches/accent-color: Add yellow accent support
Browse files Browse the repository at this point in the history
This is a new upstream accent color and we should support it in the snap
so that applications running in ubuntu >= 22.10 can use the same accent
that was configured in settings
  • Loading branch information
3v1n0 committed Oct 3, 2024
1 parent 504c3b0 commit 706ab49
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions patches/style-manager-Support-Yaru-accent-colors.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7d0ef8ee28284922c4ae87fcbc2aa6f0fe591806 Mon Sep 17 00:00:00 2001
From 248e68733a6fbc455da30d36f6c913edbe6c1f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Tue, 5 Apr 2022 16:00:46 +0200
Subject: [PATCH] style-manager: Support Yaru accent colors
Expand Down Expand Up @@ -682,10 +682,10 @@ index 98a07acf..0d86a06f 100644
<file>assets/bullet-symbolic.symbolic.png</file>
<file>assets/bullet@2-symbolic.symbolic.png</file>
diff --git a/src/stylesheet/meson.build b/src/stylesheet/meson.build
index 56466c1c..8f56cccc 100644
index 56466c1c..a77302f6 100644
--- a/src/stylesheet/meson.build
+++ b/src/stylesheet/meson.build
@@ -2,14 +2,66 @@ fs = import('fs')
@@ -2,14 +2,67 @@ fs = import('fs')

stylesheet_deps = []

Expand All @@ -703,6 +703,7 @@ index 56466c1c..8f56cccc 100644
+ 'purple',
+ 'magenta',
+ 'red',
+ 'yellow',
+ ]
+
+ yaru_accent_colors_sassc += configure_file(
Expand Down Expand Up @@ -753,7 +754,7 @@ index 56466c1c..8f56cccc 100644
if sassc.found()
sassc_opts = [ '-a', '-M', '-t', 'compact' ]

@@ -72,10 +124,21 @@ if not fs.exists('base.css')
@@ -72,10 +125,21 @@ if not fs.exists('base.css')
'defaults-dark',
]

Expand All @@ -778,7 +779,7 @@ index 56466c1c..8f56cccc 100644
command: [
sassc, sassc_opts, '@INPUT@', '@OUTPUT@',
],
@@ -85,9 +148,24 @@ if not fs.exists('base.css')
@@ -85,9 +149,24 @@ if not fs.exists('base.css')
endif
endif

Expand Down Expand Up @@ -1025,10 +1026,10 @@ index 00000000..4055eb81
\ No newline at end of file
diff --git a/src/stylesheet/yaru_accent_colors.scss b/src/stylesheet/yaru_accent_colors.scss
new file mode 100644
index 00000000..466b0a81
index 00000000..d3ea98e1
--- /dev/null
+++ b/src/stylesheet/yaru_accent_colors.scss
@@ -0,0 +1,82 @@
@@ -0,0 +1,84 @@
+// Keep this in sync with
+// https://github.com/ubuntu/yaru/blob/master/common/accent-colors.scss.in
+
Expand All @@ -1054,6 +1055,8 @@ index 00000000..466b0a81
+ $color: #B34CB3;
+ } @else if $accent_color == 'red' {
+ $color: #DA3450;
+ } @else if $accent_color == 'yellow' {
+ $color: #C88800;
+ } @else {
+ @error('No known accent color defined!');
+ }
Expand Down

0 comments on commit 706ab49

Please sign in to comment.