From 706ab49de535bb1866538e7effa63bb3e69a9e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 3 Oct 2024 12:20:22 +0200 Subject: [PATCH] libadwaita/patches/accent-color: Add yellow accent support 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 --- ...yle-manager-Support-Yaru-accent-colors.patch | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/patches/style-manager-Support-Yaru-accent-colors.patch b/patches/style-manager-Support-Yaru-accent-colors.patch index 9439943..3002aec 100644 --- a/patches/style-manager-Support-Yaru-accent-colors.patch +++ b/patches/style-manager-Support-Yaru-accent-colors.patch @@ -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?= Date: Tue, 5 Apr 2022 16:00:46 +0200 Subject: [PATCH] style-manager: Support Yaru accent colors @@ -682,10 +682,10 @@ index 98a07acf..0d86a06f 100644 assets/bullet-symbolic.symbolic.png assets/bullet@2-symbolic.symbolic.png 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 = [] @@ -703,6 +703,7 @@ index 56466c1c..8f56cccc 100644 + 'purple', + 'magenta', + 'red', ++ 'yellow', + ] + + yaru_accent_colors_sassc += configure_file( @@ -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', ] @@ -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 @@ -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 + @@ -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!'); + }