diff --git a/crates/theme/src/palette.rs b/crates/theme/src/palette.rs index f88aa993..c3ef9301 100644 --- a/crates/theme/src/palette.rs +++ b/crates/theme/src/palette.rs @@ -25,11 +25,13 @@ pub(crate) fn dark() -> ThemeColors { text_faint: TextInk::color(ThemeMode::Dark, Ink::APPKIT.dark.faint), text_dim: color::grey(0x98), - solid: color::neutral(0.922), + // The restored Radix yellow brand: #ffe629 plate, #14120b label. + solid: color::oklch(0.918, 0.184, 100.9), on_solid: color::grey(0x0e), - accent: color::neutral(0.673), - accent_strong: color::neutral(0.922), + // The restored Radix yellow brand: #f5e147 ink, #ffe629 plate. + accent: color::oklch(0.900, 0.166, 101.7), + accent_strong: color::oklch(0.918, 0.184, 100.9), on_accent: color::grey(0x0e), danger: color::oklch(0.704, 0.191, 22.216), @@ -86,12 +88,14 @@ pub(crate) fn light() -> ThemeColors { text_faint: TextInk::color(ThemeMode::Light, Ink::APPKIT.light.faint), text_dim: color::neutral(0.50), - solid: color::neutral(0.205), - on_solid: color::neutral(0.985), + // The restored Radix yellow brand: #ffe629 plate, #473b1f label. + solid: color::oklch(0.918, 0.184, 100.9), + on_solid: color::oklch(0.358, 0.046, 86.9), - accent: color::neutral(0.511), - accent_strong: color::neutral(0.205), - on_accent: color::neutral(0.985), + // The restored Radix yellow brand: #9e6c00 ink, #ffe629 plate. + accent: color::oklch(0.569, 0.119, 76.8), + accent_strong: color::oklch(0.918, 0.184, 100.9), + on_accent: color::neutral(0.205), danger: color::oklch(0.577, 0.245, 27.325), danger_muted: color::oklch(0.505, 0.213, 27.518), diff --git a/crates/ui/src/styled.rs b/crates/ui/src/styled.rs index c9564926..7be5a211 100644 --- a/crates/ui/src/styled.rs +++ b/crates/ui/src/styled.rs @@ -128,7 +128,7 @@ impl StyleSized for T { match size { Size::XSmall => self.py_0p5(), Size::Medium => self.py_2(), - Size::Large => self.py_5(), + Size::Large => self.py_1p5(), _ => self.py_1(), } } @@ -136,10 +136,10 @@ impl StyleSized for T { fn input_h(self, size: Size) -> Self { match size { Size::XSmall => self.h_6().text_style(TextStyle::Caption), - Size::Small => self.h_8().text_style(TextStyle::Callout), - Size::Medium => self.h_9().text_style(TextStyle::Body), - Size::Large => self.h_12().text_style(TextStyle::Title3), - Size::Size(size) => self.h(px(24.)).text_size(size), + Size::Small => self.h_7().text_style(TextStyle::Callout), + Size::Medium => self.h_8().text_style(TextStyle::Body), + Size::Large => self.h_10().text_style(TextStyle::Title3), + Size::Size(size) => self.h(size).text_size(size * 0.5), } } }