From 89171c4689207d310653207edbff39aa2a278b80 Mon Sep 17 00:00:00 2001
From: viktorstrate <viktorstrate@gmail.com>
Date: Sat, 21 Dec 2024 21:28:11 +0100
Subject: [PATCH] Rebase again :)

---
 masonry/src/widget/zstack.rs | 9 +++++----
 xilem/examples/http_cats.rs  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/masonry/src/widget/zstack.rs b/masonry/src/widget/zstack.rs
index 5041387dc..1b18af211 100644
--- a/masonry/src/widget/zstack.rs
+++ b/masonry/src/widget/zstack.rs
@@ -366,6 +366,7 @@ impl Widget for ZStack {
 // --- MARK: TESTS ---
 #[cfg(test)]
 mod tests {
+    use vello::peniko::color::palette;
     use vello::peniko::Color;
 
     use super::*;
@@ -380,14 +381,14 @@ mod tests {
                 SizedBox::new(Label::new("Background"))
                     .width(200.)
                     .height(100.)
-                    .background(Color::BLUE)
-                    .border(Color::TEAL, 2.),
+                    .background(palette::css::BLUE)
+                    .border(palette::css::TEAL, 2.),
                 ChildAlignment::ParentAligned,
             )
             .with_child(
                 SizedBox::new(Label::new("Foreground"))
-                    .background(Color::RED)
-                    .border(Color::PINK, 2.),
+                    .background(palette::css::RED)
+                    .border(palette::css::PINK, 2.),
                 ChildAlignment::ParentAligned,
             );
 
diff --git a/xilem/examples/http_cats.rs b/xilem/examples/http_cats.rs
index 73a21dd9a..2b28a0fdc 100644
--- a/xilem/examples/http_cats.rs
+++ b/xilem/examples/http_cats.rs
@@ -207,7 +207,7 @@ impl Status {
                     )
                     .padding(4.)
                     .rounded(4.)
-                    .background(Color::BLACK.multiply_alpha(0.5)),
+                    .background(palette::css::BLACK.multiply_alpha(0.5)),
                 )
                 .padding((30., 42., 0., 0.))
                 .alignment(Alignment::TopTrailing),