From a3ab6e93f3e308d75092484fbcf4fca1965ea269 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Fri, 21 Jul 2023 15:33:55 -0400 Subject: [PATCH] chore: update theme colors --- cosmic-theme/src/model/cosmic_palette.rs | 3 ++ cosmic-theme/src/model/dark.ron | 27 ++++++++------- cosmic-theme/src/model/derivation.rs | 42 ++++++++++++------------ cosmic-theme/src/model/light.ron | 27 ++++++++------- 4 files changed, 54 insertions(+), 45 deletions(-) diff --git a/cosmic-theme/src/model/cosmic_palette.rs b/cosmic-theme/src/model/cosmic_palette.rs index 45a95561..6ad225eb 100644 --- a/cosmic-theme/src/model/cosmic_palette.rs +++ b/cosmic-theme/src/model/cosmic_palette.rs @@ -105,6 +105,8 @@ pub struct CosmicPaletteInner { /// System Neutrals /// A wider spread of dark colors for more general use. + pub neutral_0: C, + /// A wider spread of dark colors for more general use. pub neutral_1: C, /// A wider spread of dark colors for more general use. pub neutral_2: C, @@ -166,6 +168,7 @@ impl From> for CosmicPaletteInner { gray_1: p.gray_1.into(), gray_2: p.gray_2.into(), gray_3: p.gray_3.into(), + neutral_0: p.neutral_0.into(), neutral_1: p.neutral_1.into(), neutral_2: p.neutral_2.into(), neutral_3: p.neutral_3.into(), diff --git a/cosmic-theme/src/model/dark.ron b/cosmic-theme/src/model/dark.ron index d8d0ba8f..9f283121 100644 --- a/cosmic-theme/src/model/dark.ron +++ b/cosmic-theme/src/model/dark.ron @@ -14,40 +14,43 @@ Dark ( c: "#FFF19E", ), gray_1: ( - c: "#1E1E1E", + c: "#1B1B1B", ), gray_2: ( - c: "#292929", + c: "#262626", ), gray_3: ( - c: "#2E2E2E", + c: "#303030", ), - neutral_1: ( + neutral_0: ( c: "#000000", ), + neutral_1: ( + c: "#1B1B1B", + ), neutral_2: ( - c: "#272727", + c: "#303030", ), neutral_3: ( - c: "#424242", + c: "#474747", ), neutral_4: ( - c: "#5D5D5D", + c: "#5E5E5E", ), neutral_5: ( - c: "#787878", + c: "#777777", ), neutral_6: ( - c: "#939393", + c: "#919191", ), neutral_7: ( - c: "#AEAEAE", + c: "#ABABAB", ), neutral_8: ( - c: "#C9C9C9", + c: "#C6C6C6", ), neutral_9: ( - c: "#E4E4E4", + c: "#E2E2E2", ), neutral_10: ( c: "#FFFFFF", diff --git a/cosmic-theme/src/model/derivation.rs b/cosmic-theme/src/model/derivation.rs index c030dd34..9c186c9f 100644 --- a/cosmic-theme/src/model/derivation.rs +++ b/cosmic-theme/src/model/derivation.rs @@ -334,7 +334,7 @@ where match (p, t) { (CosmicPalette::Dark(p), ComponentType::Background) => Self::component( p.gray_1, - p.neutral_1, + p.neutral_0, p.neutral_10, 0.08, p.blue, @@ -344,7 +344,7 @@ where (CosmicPalette::Dark(p), ComponentType::Primary) => Self::component( p.gray_2, - p.neutral_1, + p.neutral_0, p.neutral_10, 0.08, p.blue, @@ -354,7 +354,7 @@ where (CosmicPalette::Dark(p), ComponentType::Secondary) => Self::component( p.gray_3, - p.neutral_1, + p.neutral_0, p.neutral_10, 0.08, p.blue, @@ -363,7 +363,7 @@ where ), (CosmicPalette::HighContrastDark(p), ComponentType::Background) => Self::component( p.gray_1, - p.neutral_1, + p.neutral_0, p.neutral_10, 0.08, p.blue, @@ -372,7 +372,7 @@ where ), (CosmicPalette::HighContrastDark(p), ComponentType::Primary) => Self::component( p.gray_2, - p.neutral_1, + p.neutral_0, p.neutral_10, 0.08, p.blue, @@ -381,7 +381,7 @@ where ), (CosmicPalette::HighContrastDark(p), ComponentType::Secondary) => Self::component( p.gray_3, - p.neutral_1, + p.neutral_0, p.neutral_10.clone(), 0.08, p.blue, @@ -391,8 +391,8 @@ where (CosmicPalette::Light(p), ComponentType::Background) => Component::component( p.gray_1.clone(), - p.neutral_1.clone(), - p.neutral_1, + p.neutral_0.clone(), + p.neutral_0, 0.75, p.blue.clone(), p.neutral_8, @@ -400,8 +400,8 @@ where ), (CosmicPalette::Light(p), ComponentType::Primary) => Component::component( p.gray_2.clone(), - p.neutral_1.clone(), - p.neutral_1, + p.neutral_0.clone(), + p.neutral_0, 0.9, p.blue.clone(), p.neutral_8, @@ -409,8 +409,8 @@ where ), (CosmicPalette::Light(p), ComponentType::Secondary) => Component::component( p.gray_3.clone(), - p.neutral_1.clone(), - p.neutral_1, + p.neutral_0.clone(), + p.neutral_0, 1.0, p.blue.clone(), p.neutral_8, @@ -419,8 +419,8 @@ where (CosmicPalette::HighContrastLight(p), ComponentType::Background) => { Component::component( p.gray_1.clone(), - p.neutral_1.clone(), - p.neutral_1, + p.neutral_0.clone(), + p.neutral_0, 0.75, p.blue.clone(), p.neutral_9, @@ -429,8 +429,8 @@ where } (CosmicPalette::HighContrastLight(p), ComponentType::Primary) => Component::component( p.gray_2.clone(), - p.neutral_1.clone(), - p.neutral_1, + p.neutral_0.clone(), + p.neutral_0, 0.9, p.blue.clone(), p.neutral_9, @@ -439,8 +439,8 @@ where (CosmicPalette::HighContrastLight(p), ComponentType::Secondary) => { Component::component( p.gray_3.clone(), - p.neutral_1.clone(), - p.neutral_1, + p.neutral_0.clone(), + p.neutral_0, 1.0, p.blue.clone(), p.neutral_9, @@ -459,21 +459,21 @@ where | (CosmicPalette::Light(p), ComponentType::Warning) | (CosmicPalette::HighContrastLight(p), ComponentType::Warning) | (CosmicPalette::HighContrastDark(p), ComponentType::Warning) => { - Component::colored_component(p.yellow.clone(), p.neutral_1, p.blue.clone()) + Component::colored_component(p.yellow.clone(), p.neutral_0, p.blue.clone()) } (CosmicPalette::Dark(p), ComponentType::Success) | (CosmicPalette::Light(p), ComponentType::Success) | (CosmicPalette::HighContrastLight(p), ComponentType::Success) | (CosmicPalette::HighContrastDark(p), ComponentType::Success) => { - Component::colored_component(p.green.clone(), p.neutral_1, p.blue.clone()) + Component::colored_component(p.green.clone(), p.neutral_0, p.blue.clone()) } (CosmicPalette::Dark(p), ComponentType::Accent) | (CosmicPalette::Light(p), ComponentType::Accent) | (CosmicPalette::HighContrastDark(p), ComponentType::Accent) | (CosmicPalette::HighContrastLight(p), ComponentType::Accent) => { - Component::colored_component(p.blue.clone(), p.neutral_1, p.blue.clone()) + Component::colored_component(p.blue.clone(), p.neutral_0, p.blue.clone()) } } } diff --git a/cosmic-theme/src/model/light.ron b/cosmic-theme/src/model/light.ron index 92951bb7..cd9f0f93 100644 --- a/cosmic-theme/src/model/light.ron +++ b/cosmic-theme/src/model/light.ron @@ -14,40 +14,43 @@ Light ( c: "#966800", ), gray_1: ( - c: "#DEDEDE", + c: "#DDDDDD", ), gray_2: ( - c: "#E9E9E9", + c: "#E8E8E8", ), gray_3: ( - c: "#F4F4F4", + c: "#F3F3F3", ), - neutral_1: ( + neutral_0: ( c: "#FFFFFF", ), + neutral_1: ( + c: "#E2E2E2", + ), neutral_2: ( - c: "#E4E4E4", + c: "#C6C6C6", ), neutral_3: ( - c: "#C9C9C9", + c: "#ABABAB", ), neutral_4: ( - c: "#AEAEAE", + c: "#919191", ), neutral_5: ( - c: "#939393", + c: "#777777", ), neutral_6: ( - c: "#787878", + c: "#5E5E5E", ), neutral_7: ( - c: "#5D5D5D", + c: "#474747", ), neutral_8: ( - c: "#424242", + c: "#303030", ), neutral_9: ( - c: "#272727", + c: "#1B1B1B", ), neutral_10: ( c: "#000000",