From 7841a56a11bde8ef72bdcacbfae1b80ade1b3a20 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 30 Oct 2023 16:21:59 -0400 Subject: [PATCH 1/6] Start work on defining color scales --- crates/theme2/src/default.rs | 101 +++++++++++++++++++++ crates/theme2/src/scale.rs | 166 +++++++++++++++++++++++++++++++++++ crates/theme2/src/theme2.rs | 8 ++ 3 files changed, 275 insertions(+) create mode 100644 crates/theme2/src/default.rs create mode 100644 crates/theme2/src/scale.rs diff --git a/crates/theme2/src/default.rs b/crates/theme2/src/default.rs new file mode 100644 index 0000000000000000000000000000000000000000..d1550f9e78773d1fc83d79e400fe9e4aab587c70 --- /dev/null +++ b/crates/theme2/src/default.rs @@ -0,0 +1,101 @@ +use std::collections::HashMap; + +use gpui2::Rgba; + +use crate::scale::{ColorScaleName, ColorScaleSet, ColorScales}; + +struct DefaultColorScaleSet { + scale: ColorScaleName, + light: [&'static str; 12], + light_alpha: [&'static str; 12], + dark: [&'static str; 12], + dark_alpha: [&'static str; 12], +} + +impl From for ColorScaleSet { + fn from(default: DefaultColorScaleSet) -> Self { + Self::new( + default.scale, + default + .light + .map(|color| Rgba::try_from(color).unwrap().into()), + default + .light_alpha + .map(|color| Rgba::try_from(color).unwrap().into()), + default + .dark + .map(|color| Rgba::try_from(color).unwrap().into()), + default + .dark_alpha + .map(|color| Rgba::try_from(color).unwrap().into()), + ) + } +} + +pub fn default_color_scales() -> ColorScales { + use ColorScaleName::*; + + HashMap::from_iter([(Red, red().into())]) +} + +fn red() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Red, + light: [ + "#fffcfc00", + "#fff7f700", + "#feebec00", + "#ffdbdc00", + "#ffcdce00", + "#fdbdbe00", + "#f4a9aa00", + "#eb8e9000", + "#e5484d00", + "#dc3e4200", + "#ce2c3100", + "#64172300", + ], + light_alpha: [ + "#ff000003", + "#ff000008", + "#f3000d14", + "#ff000824", + "#ff000632", + "#f8000442", + "#df000356", + "#d2000571", + "#db0007b7", + "#d10005c1", + "#c40006d3", + "#55000de8", + ], + dark: [ + "#19111100", + "#20131400", + "#3b121900", + "#500f1c00", + "#61162300", + "#72232d00", + "#8c333a00", + "#b5454800", + "#e5484d00", + "#ec5d5e00", + "#ff959200", + "#ffd1d900", + ], + dark_alpha: [ + "#f4121209", + "#f22f3e11", + "#ff173f2d", + "#fe0a3b44", + "#ff204756", + "#ff3e5668", + "#ff536184", + "#ff5d61b0", + "#fe4e54e4", + "#ff6465eb", + "#ff959200", + "#ffd1d900", + ], + } +} diff --git a/crates/theme2/src/scale.rs b/crates/theme2/src/scale.rs new file mode 100644 index 0000000000000000000000000000000000000000..a7bd6a5e22fe76c0f47d9062aa68a9f014f001da --- /dev/null +++ b/crates/theme2/src/scale.rs @@ -0,0 +1,166 @@ +use std::collections::HashMap; + +use gpui2::{AppContext, Hsla}; + +use crate::{theme, Appearance}; + +#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] +pub enum ColorScaleName { + Gray, + Mauve, + Slate, + Sage, + Olive, + Sand, + Gold, + Bronze, + Brown, + Yellow, + Amber, + Orange, + Tomato, + Red, + Ruby, + Crimson, + Pink, + Plum, + Purple, + Violet, + Iris, + Indigo, + Blue, + Cyan, + Teal, + Jade, + Green, + Grass, + Lime, + Mint, + Sky, + Black, + White, +} + +impl std::fmt::Display for ColorScaleName { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!( + f, + "{}", + match self { + Self::Gray => "Gray", + Self::Mauve => "Mauve", + Self::Slate => "Slate", + Self::Sage => "Sage", + Self::Olive => "Olive", + Self::Sand => "Sand", + Self::Gold => "Gold", + Self::Bronze => "Bronze", + Self::Brown => "Brown", + Self::Yellow => "Yellow", + Self::Amber => "Amber", + Self::Orange => "Orange", + Self::Tomato => "Tomato", + Self::Red => "Red", + Self::Ruby => "Ruby", + Self::Crimson => "Crimson", + Self::Pink => "Pink", + Self::Plum => "Plum", + Self::Purple => "Purple", + Self::Violet => "Violet", + Self::Iris => "Iris", + Self::Indigo => "Indigo", + Self::Blue => "Blue", + Self::Cyan => "Cyan", + Self::Teal => "Teal", + Self::Jade => "Jade", + Self::Green => "Green", + Self::Grass => "Grass", + Self::Lime => "Lime", + Self::Mint => "Mint", + Self::Sky => "Sky", + Self::Black => "Black", + Self::White => "White", + } + ) + } +} + +pub type ColorScale = [Hsla; 12]; + +pub type ColorScales = HashMap; + +pub struct ColorScaleSet { + name: ColorScaleName, + light: ColorScale, + dark: ColorScale, + light_alpha: ColorScale, + dark_alpha: ColorScale, +} + +impl ColorScaleSet { + pub fn new( + name: ColorScaleName, + light: ColorScale, + light_alpha: ColorScale, + dark: ColorScale, + dark_alpha: ColorScale, + ) -> Self { + Self { + name, + light, + light_alpha, + dark, + dark_alpha, + } + } + + pub fn name(&self) -> String { + self.name.to_string() + } + + pub fn light(&self, step: usize) -> Hsla { + self.light[step - 1] + } + + pub fn light_alpha(&self, step: usize) -> Hsla { + self.light_alpha[step - 1] + } + + pub fn dark(&self, step: usize) -> Hsla { + self.dark[step - 1] + } + + pub fn dark_alpha(&self, step: usize) -> Hsla { + self.dark[step - 1] + } + + fn current_appearance(cx: &AppContext) -> Appearance { + let theme = theme(cx); + if theme.metadata.is_light { + Appearance::Light + } else { + Appearance::Dark + } + } + + /// Returns the one-based step in the scale. + /// + /// We usually reference steps as 1-12 instead of 0-11, so we + /// automatically subtract 1 from the index. + pub fn step(self, cx: &AppContext, index: usize) -> Hsla { + let appearance = Self::current_appearance(cx); + + match appearance { + Appearance::Light => self.light(index), + Appearance::Dark => self.dark(index), + } + } + + pub fn step_alpha(self, cx: &AppContext, index: usize) -> Hsla { + let appearance = Self::current_appearance(cx); + match appearance { + Appearance::Light => self.light_alpha(index), + Appearance::Dark => self.dark_alpha(index), + } + } +} diff --git a/crates/theme2/src/theme2.rs b/crates/theme2/src/theme2.rs index 6d4d5269e3ce0f5a1641a093fe65d7e595dd48c5..66d70296d25579310ee4576efc8614e72f915b50 100644 --- a/crates/theme2/src/theme2.rs +++ b/crates/theme2/src/theme2.rs @@ -1,4 +1,6 @@ +mod default; mod registry; +mod scale; mod settings; mod themes; @@ -9,6 +11,12 @@ use gpui2::{AppContext, HighlightStyle, Hsla, SharedString}; use settings2::Settings; use std::sync::Arc; +#[derive(Debug, Clone, PartialEq)] +pub enum Appearance { + Light, + Dark, +} + pub fn init(cx: &mut AppContext) { cx.set_global(ThemeRegistry::default()); ThemeSettings::register(cx); From ccccf84867454437e444605616615b117e1e9e2a Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 30 Oct 2023 17:00:46 -0400 Subject: [PATCH 2/6] Define all color scales --- crates/theme2/src/default.rs | 1984 ++++++++++++++++++++++++++++++++++ 1 file changed, 1984 insertions(+) diff --git a/crates/theme2/src/default.rs b/crates/theme2/src/default.rs index d1550f9e78773d1fc83d79e400fe9e4aab587c70..cdfd135885eebbf55809403307effc5af569e118 100644 --- a/crates/theme2/src/default.rs +++ b/crates/theme2/src/default.rs @@ -38,6 +38,812 @@ pub fn default_color_scales() -> ColorScales { HashMap::from_iter([(Red, red().into())]) } +fn gray() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Gray, + light: [ + "#fcfcfc00", + "#f9f9f900", + "#f0f0f000", + "#e8e8e800", + "#e0e0e000", + "#d9d9d900", + "#cecece00", + "#bbbbbb00", + "#8d8d8d00", + "#83838300", + "#64646400", + "#20202000", + ], + light_alpha: [ + "#00000003", + "#00000006", + "#0000000f", + "#00000017", + "#0000001f", + "#00000026", + "#00000031", + "#00000044", + "#00000072", + "#0000007c", + "#0000009b", + "#000000df", + ], + dark: [ + "#11111100", + "#19191900", + "#22222200", + "#2a2a2a00", + "#31313100", + "#3a3a3a00", + "#48484800", + "#60606000", + "#6e6e6e00", + "#7b7b7b00", + "#b4b4b400", + "#eeeeee00", + ], + dark_alpha: [ + "#00000000", + "#ffffff09", + "#ffffff12", + "#ffffff1b", + "#ffffff22", + "#ffffff2c", + "#ffffff3b", + "#ffffff55", + "#ffffff64", + "#ffffff72", + "#ffffffaf", + "#ffffffed", + ], + } +} + +fn mauve() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Mauve, + light: [ + "#fdfcfd00", + "#faf9fb00", + "#f2eff300", + "#eae7ec00", + "#e3dfe600", + "#dbd8e000", + "#d0cdd700", + "#bcbac700", + "#8e8c9900", + "#84828e00", + "#65636d00", + "#211f2600", + ], + light_alpha: [ + "#55005503", + "#2b005506", + "#30004010", + "#20003618", + "#20003820", + "#14003527", + "#10003332", + "#08003145", + "#05001d73", + "#0500197d", + "#0400119c", + "#020008e0", + ], + dark: [ + "#12111300", + "#1a191b00", + "#23222500", + "#2b292d00", + "#32303500", + "#3c393f00", + "#49474e00", + "#625f6900", + "#6f6d7800", + "#7c7a8500", + "#b5b2bc00", + "#eeeef000", + ], + dark_alpha: [ + "#00000000", + "#f5f4f609", + "#ebeaf814", + "#eee5f81d", + "#efe6fe25", + "#f1e6fd30", + "#eee9ff40", + "#eee7ff5d", + "#eae6fd6e", + "#ece9fd7c", + "#f5f1ffb7", + "#fdfdffef", + ], + } +} + +fn slate() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Slate, + light: [ + "#fcfcfd00", + "#f9f9fb00", + "#f0f0f300", + "#e8e8ec00", + "#e0e1e600", + "#d9d9e000", + "#cdced600", + "#b9bbc600", + "#8b8d9800", + "#80838d00", + "#60646c00", + "#1c202400", + ], + light_alpha: [ + "#00005503", + "#00005506", + "#0000330f", + "#00002d17", + "#0009321f", + "#00002f26", + "#00062e32", + "#00083046", + "#00051d74", + "#00071b7f", + "#0007149f", + "#000509e3", + ], + dark: [ + "#11111300", + "#18191b00", + "#21222500", + "#272a2d00", + "#2e313500", + "#363a3f00", + "#43484e00", + "#5a616900", + "#696e7700", + "#777b8400", + "#b0b4ba00", + "#edeef000", + ], + dark_alpha: [ + "#00000000", + "#d8f4f609", + "#ddeaf814", + "#d3edf81d", + "#d9edfe25", + "#d6ebfd30", + "#d9edff40", + "#d9edff5d", + "#dfebfd6d", + "#e5edfd7b", + "#f1f7feb5", + "#fcfdffef", + ], + } +} + +fn sage() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Sage, + light: [ + "#fbfdfc00", + "#f7f9f800", + "#eef1f000", + "#e6e9e800", + "#dfe2e000", + "#d7dad900", + "#cbcfcd00", + "#b8bcba00", + "#868e8b00", + "#7c848100", + "#5f656300", + "#1a211e00", + ], + light_alpha: [ + "#00804004", + "#00402008", + "#002d1e11", + "#001f1519", + "#00180820", + "#00140d28", + "#00140a34", + "#000f0847", + "#00110b79", + "#00100a83", + "#000a07a0", + "#000805e5", + ], + dark: [ + "#10121100", + "#17191800", + "#20222100", + "#272a2900", + "#2e313000", + "#373b3900", + "#44494700", + "#5b625f00", + "#63706b00", + "#717d7900", + "#adb5b200", + "#eceeed00", + ], + dark_alpha: [ + "#00000000", + "#f0f2f108", + "#f3f5f412", + "#f2fefd1a", + "#f1fbfa22", + "#edfbf42d", + "#edfcf73c", + "#ebfdf657", + "#dffdf266", + "#e5fdf674", + "#f4fefbb0", + "#fdfffeed", + ], + } +} + +fn olive() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Olive, + light: [ + "#fcfdfc00", + "#f8faf800", + "#eff1ef00", + "#e7e9e700", + "#dfe2df00", + "#d7dad700", + "#cccfcc00", + "#b9bcb800", + "#898e8700", + "#7f847d00", + "#60655f00", + "#1d211c00", + ], + light_alpha: [ + "#00550003", + "#00490007", + "#00200010", + "#00160018", + "#00180020", + "#00140028", + "#000f0033", + "#040f0047", + "#050f0078", + "#040e0082", + "#020a00a0", + "#010600e3", + ], + dark: [ + "#11121000", + "#18191700", + "#21222000", + "#282a2700", + "#2f312e00", + "#383a3600", + "#45484300", + "#5c625b00", + "#68706600", + "#767d7400", + "#afb5ad00", + "#eceeec00", + ], + dark_alpha: [ + "#00000000", + "#f1f2f008", + "#f4f5f312", + "#f3fef21a", + "#f2fbf122", + "#f4faed2c", + "#f2fced3b", + "#edfdeb57", + "#ebfde766", + "#f0fdec74", + "#f6fef4b0", + "#fdfffded", + ], + } +} + +fn sand() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Sand, + light: [ + "#fdfdfc00", + "#f9f9f800", + "#f1f0ef00", + "#e9e8e600", + "#e2e1de00", + "#dad9d600", + "#cfceca00", + "#bcbbb500", + "#8d8d8600", + "#82827c00", + "#63635e00", + "#21201c00", + ], + light_alpha: [ + "#55550003", + "#25250007", + "#20100010", + "#1f150019", + "#1f180021", + "#19130029", + "#19140035", + "#1915014a", + "#0f0f0079", + "#0c0c0083", + "#080800a1", + "#060500e3", + ], + dark: [ + "#11111000", + "#19191800", + "#22222100", + "#2a2a2800", + "#31312e00", + "#3b3a3700", + "#49484400", + "#62605b00", + "#6f6d6600", + "#7c7b7400", + "#b5b3ad00", + "#eeeeec00", + ], + dark_alpha: [ + "#00000000", + "#f4f4f309", + "#f6f6f513", + "#fefef31b", + "#fbfbeb23", + "#fffaed2d", + "#fffbed3c", + "#fff9eb57", + "#fffae965", + "#fffdee73", + "#fffcf4b0", + "#fffffded", + ], + } +} + +fn gold() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Gold, + light: [ + "#fdfdfc00", + "#faf9f200", + "#f2f0e700", + "#eae6db00", + "#e1dccf00", + "#d8d0bf00", + "#cbc0aa00", + "#b9a88d00", + "#97836500", + "#8c7a5e00", + "#71624b00", + "#3b352b00", + ], + light_alpha: [ + "#55550003", + "#9d8a000d", + "#75600018", + "#6b4e0024", + "#60460030", + "#64440040", + "#63420055", + "#633d0072", + "#5332009a", + "#492d00a1", + "#362100b4", + "#130c00d4", + ], + dark: [ + "#12121100", + "#1b1a1700", + "#24231f00", + "#2d2b2600", + "#38352e00", + "#44403900", + "#544f4600", + "#69625600", + "#97836500", + "#a3907300", + "#cbb99f00", + "#e8e2d900", + ], + dark_alpha: [ + "#91911102", + "#f9e29d0b", + "#f8ecbb15", + "#ffeec41e", + "#feecc22a", + "#feebcb37", + "#ffedcd48", + "#fdeaca5f", + "#ffdba690", + "#fedfb09d", + "#fee7c6c8", + "#fef7ede7", + ], + } +} + +fn bronze() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Bronze, + light: [ + "#fdfcfc00", + "#fdf7f500", + "#f6edea00", + "#efe4df00", + "#e7d9d300", + "#dfcdc500", + "#d3bcb300", + "#c2a49900", + "#a1807200", + "#95746800", + "#7d5e5400", + "#43302b00", + ], + light_alpha: [ + "#55000003", + "#cc33000a", + "#92250015", + "#80280020", + "#7423002c", + "#7324003a", + "#6c1f004c", + "#671c0066", + "#551a008d", + "#4c150097", + "#3d0f00ab", + "#1d0600d4", + ], + dark: [ + "#14111000", + "#1c191700", + "#26222000", + "#302a2700", + "#3b333000", + "#493e3a00", + "#5a4c4700", + "#6f5f5800", + "#a1807200", + "#ae8c7e00", + "#d4b3a500", + "#ede0d900", + ], + dark_alpha: [ + "#d1110004", + "#fbbc910c", + "#faceb817", + "#facdb622", + "#ffd2c12d", + "#ffd1c03c", + "#fdd0c04f", + "#ffd6c565", + "#fec7b09b", + "#fecab5a9", + "#ffd7c6d1", + "#fff1e9ec", + ], + } +} + +fn brown() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Brown, + light: [ + "#fefdfc00", + "#fcf9f600", + "#f6eee700", + "#f0e4d900", + "#ebdaca00", + "#e4cdb700", + "#dcbc9f00", + "#cea37e00", + "#ad7f5800", + "#a0755300", + "#815e4600", + "#3e332e00", + ], + light_alpha: [ + "#aa550003", + "#aa550009", + "#a04b0018", + "#9b4a0026", + "#9f4d0035", + "#a04e0048", + "#a34e0060", + "#9f4a0081", + "#823c00a7", + "#723300ac", + "#522100b9", + "#140600d1", + ], + dark: [ + "#12110f00", + "#1c181600", + "#28211d00", + "#32292200", + "#3e312800", + "#4d3c2f00", + "#614a3900", + "#7c5f4600", + "#ad7f5800", + "#b88c6700", + "#dbb59400", + "#f2e1ca00", + ], + dark_alpha: [ + "#91110002", + "#fba67c0c", + "#fcb58c19", + "#fbbb8a24", + "#fcb88931", + "#fdba8741", + "#ffbb8856", + "#ffbe8773", + "#feb87da8", + "#ffc18cb3", + "#fed1aad9", + "#feecd4f2", + ], + } +} + +fn yellow() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Yellow, + light: [ + "#fdfdf900", + "#fefce900", + "#fffab800", + "#fff39400", + "#ffe77000", + "#f3d76800", + "#e4c76700", + "#d5ae3900", + "#ffe62900", + "#ffdc0000", + "#9e6c0000", + "#473b1f00", + ], + light_alpha: [ + "#aaaa0006", + "#f4dd0016", + "#ffee0047", + "#ffe3016b", + "#ffd5008f", + "#ebbc0097", + "#d2a10098", + "#c99700c6", + "#ffe100d6", + "#ffdc0000", + "#9e6c0000", + "#2e2000e0", + ], + dark: [ + "#14120b00", + "#1b180f00", + "#2d230500", + "#362b0000", + "#43350000", + "#52420200", + "#66541700", + "#836a2100", + "#ffe62900", + "#ffff5700", + "#f5e14700", + "#f6eeb400", + ], + dark_alpha: [ + "#d1510004", + "#f9b4000b", + "#ffaa001e", + "#fdb70028", + "#febb0036", + "#fec40046", + "#fdcb225c", + "#fdca327b", + "#ffe62900", + "#ffff5700", + "#fee949f5", + "#fef6baf6", + ], + } +} + +fn amber() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Amber, + light: [ + "#fefdfb00", + "#fefbe900", + "#fff7c200", + "#ffee9c00", + "#fbe57700", + "#f3d67300", + "#e9c16200", + "#e2a33600", + "#ffc53d00", + "#ffba1800", + "#ab640000", + "#4f342200", + ], + light_alpha: [ + "#c0800004", + "#f4d10016", + "#ffde003d", + "#ffd40063", + "#f8cf0088", + "#eab5008c", + "#dc9b009d", + "#da8a00c9", + "#ffb300c2", + "#ffb300e7", + "#ab640000", + "#341500dd", + ], + dark: [ + "#16120c00", + "#1d180f00", + "#30200800", + "#3f270000", + "#4d300000", + "#5c3d0500", + "#714f1900", + "#8f642400", + "#ffc53d00", + "#ffd60a00", + "#ffca1600", + "#ffe7b300", + ], + dark_alpha: [ + "#e63c0006", + "#fd9b000d", + "#fa820022", + "#fc820032", + "#fd8b0041", + "#fd9b0051", + "#ffab2567", + "#ffae3587", + "#ffc53d00", + "#ffd60a00", + "#ffca1600", + "#ffe7b300", + ], + } +} + +fn orange() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Orange, + light: [ + "#fefcfb00", + "#fff7ed00", + "#ffefd600", + "#ffdfb500", + "#ffd19a00", + "#ffc18200", + "#f5ae7300", + "#ec945500", + "#f76b1500", + "#ef5f0000", + "#cc4e0000", + "#582d1d00", + ], + light_alpha: [ + "#c0400004", + "#ff8e0012", + "#ff9c0029", + "#ff91014a", + "#ff8b0065", + "#ff81007d", + "#ed6c008c", + "#e35f00aa", + "#f65e00ea", + "#ef5f0000", + "#cc4e0000", + "#431200e2", + ], + dark: [ + "#17120e00", + "#1e160f00", + "#331e0b00", + "#46210000", + "#56280000", + "#66350c00", + "#7e451d00", + "#a3582900", + "#f76b1500", + "#ff801f00", + "#ffa05700", + "#ffe0c200", + ], + dark_alpha: [ + "#ec360007", + "#fe6d000e", + "#fb6a0025", + "#ff590039", + "#ff61004a", + "#fd75045c", + "#ff832c75", + "#fe84389d", + "#fe6d15f7", + "#ff801f00", + "#ffa05700", + "#ffe0c200", + ], + } +} + +fn tomato() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Tomato, + light: [ + "#fffcfc00", + "#fff8f700", + "#feebe700", + "#ffdcd300", + "#ffcdc200", + "#fdbdaf00", + "#f5a89800", + "#ec8e7b00", + "#e54d2e00", + "#dd442500", + "#d1341500", + "#5c271f00", + ], + light_alpha: [ + "#ff000003", + "#ff200008", + "#f52b0018", + "#ff35002c", + "#ff2e003d", + "#f92d0050", + "#e7280067", + "#db250084", + "#df2600d1", + "#d72400da", + "#cd2200ea", + "#460900e0", + ], + dark: [ + "#18111100", + "#1f151300", + "#39171400", + "#4e151100", + "#5e1c1600", + "#6e292000", + "#853a2d00", + "#ac4d3900", + "#e54d2e00", + "#ec614200", + "#ff977d00", + "#fbd3cb00", + ], + dark_alpha: [ + "#f1121208", + "#ff55330f", + "#ff35232b", + "#fd201142", + "#fe332153", + "#ff4f3864", + "#fd644a7d", + "#fe6d4ea7", + "#fe5431e4", + "#ff6847eb", + "#ff977d00", + "#ffd6cefb", + ], + } +} + fn red() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Red, @@ -99,3 +905,1181 @@ fn red() -> DefaultColorScaleSet { ], } } + +fn ruby() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Ruby, + light: [ + "#fffcfd00", + "#fff7f800", + "#feeaed00", + "#ffdce100", + "#ffced600", + "#f8bfc800", + "#efacb800", + "#e592a300", + "#e5466600", + "#dc3b5d00", + "#ca244d00", + "#64172b00", + ], + light_alpha: [ + "#ff005503", + "#ff002008", + "#f3002515", + "#ff002523", + "#ff002a31", + "#e4002440", + "#ce002553", + "#c300286d", + "#db002cb9", + "#d2002cc4", + "#c10030db", + "#550016e8", + ], + dark: [ + "#19111300", + "#1e151700", + "#3a141e00", + "#4e132500", + "#5e1a2e00", + "#6f253900", + "#88344700", + "#b3445a00", + "#e5466600", + "#ec5a7200", + "#ff949d00", + "#fed2e100", + ], + dark_alpha: [ + "#f4124a09", + "#fe5a7f0e", + "#ff235d2c", + "#fd195e42", + "#fe2d6b53", + "#ff447665", + "#ff577d80", + "#ff5c7cae", + "#fe4c70e4", + "#ff617beb", + "#ff949d00", + "#ffd3e2fe", + ], + } +} + +fn crimson() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Crimson, + light: [ + "#fffcfd00", + "#fef7f900", + "#ffe9f000", + "#fedce700", + "#facedd00", + "#f3bed100", + "#eaacc300", + "#e093b200", + "#e93d8200", + "#df347800", + "#cb1d6300", + "#62163900", + ], + light_alpha: [ + "#ff005503", + "#e0004008", + "#ff005216", + "#f8005123", + "#e5004f31", + "#d0004b41", + "#bf004753", + "#b6004a6c", + "#e2005bc2", + "#d70056cb", + "#c4004fe2", + "#530026e9", + ], + dark: [ + "#19111400", + "#20131800", + "#38152500", + "#4d122f00", + "#5c183900", + "#6d254500", + "#87335600", + "#b0436e00", + "#e93d8200", + "#ee518a00", + "#ff92ad00", + "#fdd3e800", + ], + dark_alpha: [ + "#f4126709", + "#f22f7a11", + "#fe2a8b2a", + "#fd158741", + "#fd278f51", + "#fe459763", + "#fd559b7f", + "#fe5b9bab", + "#fe418de8", + "#ff5693ed", + "#ff92ad00", + "#ffd5eafd", + ], + } +} + +fn pink() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Pink, + light: [ + "#fffcfe00", + "#fef7fb00", + "#fee9f500", + "#fbdcef00", + "#f6cee700", + "#efbfdd00", + "#e7acd000", + "#dd93c200", + "#d6409f00", + "#cf389700", + "#c2298a00", + "#65124900", + ], + light_alpha: [ + "#ff00aa03", + "#e0008008", + "#f4008c16", + "#e2008b23", + "#d1008331", + "#c0007840", + "#b6006f53", + "#af006f6c", + "#c8007fbf", + "#c2007ac7", + "#b60074d6", + "#59003bed", + ], + dark: [ + "#19111700", + "#21121d00", + "#37172f00", + "#4b143d00", + "#591c4700", + "#69295500", + "#83386900", + "#a8488500", + "#d6409f00", + "#de51a800", + "#ff8dcc00", + "#fdd1ea00", + ], + dark_alpha: [ + "#f412bc09", + "#f420bb12", + "#fe37cc29", + "#fc1ec43f", + "#fd35c24e", + "#fd51c75f", + "#fd62c87b", + "#ff68c8a2", + "#fe49bcd4", + "#ff5cc0dc", + "#ff8dcc00", + "#ffd3ecfd", + ], + } +} + +fn plum() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Plum, + light: [ + "#fefcff00", + "#fdf7fd00", + "#fbebfb00", + "#f7def800", + "#f2d1f300", + "#e9c2ec00", + "#deade300", + "#cf91d800", + "#ab4aba00", + "#a144af00", + "#953ea300", + "#53195d00", + ], + light_alpha: [ + "#aa00ff03", + "#c000c008", + "#cc00cc14", + "#c200c921", + "#b700bd2e", + "#a400b03d", + "#9900a852", + "#9000a56e", + "#89009eb5", + "#7f0092bb", + "#730086c1", + "#40004be6", + ], + dark: [ + "#18111800", + "#20132000", + "#351a3500", + "#451d4700", + "#51245400", + "#5e306100", + "#73407900", + "#92549c00", + "#ab4aba00", + "#b658c400", + "#e796f300", + "#f4d4f400", + ], + dark_alpha: [ + "#f112f108", + "#f22ff211", + "#fd4cfd27", + "#f646ff3a", + "#f455ff48", + "#f66dff56", + "#f07cfd70", + "#ee84ff95", + "#e961feb6", + "#ed70ffc0", + "#f19cfef3", + "#feddfef4", + ], + } +} + +fn purple() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Purple, + light: [ + "#fefcfe00", + "#fbf7fe00", + "#f7edfe00", + "#f2e2fc00", + "#ead5f900", + "#e0c4f400", + "#d1afec00", + "#be93e400", + "#8e4ec600", + "#8347b900", + "#8145b500", + "#40206000", + ], + light_alpha: [ + "#aa00aa03", + "#8000e008", + "#8e00f112", + "#8d00e51d", + "#8000db2a", + "#7a01d03b", + "#6d00c350", + "#6600c06c", + "#5c00adb1", + "#53009eb8", + "#52009aba", + "#250049df", + ], + dark: [ + "#18111b00", + "#1e152300", + "#301c3b00", + "#3d224e00", + "#48295c00", + "#54346b00", + "#66428200", + "#8457aa00", + "#8e4ec600", + "#9a5cd000", + "#d19dff00", + "#ecd9fa00", + ], + dark_alpha: [ + "#b412f90b", + "#b744f714", + "#c150ff2d", + "#bb53fd42", + "#be5cfd51", + "#c16dfd61", + "#c378fd7a", + "#c47effa4", + "#b661ffc2", + "#bc6fffcd", + "#d19dff00", + "#f1ddfffa", + ], + } +} + +fn violet() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Violet, + light: [ + "#fdfcfe00", + "#faf8ff00", + "#f4f0fe00", + "#ebe4ff00", + "#e1d9ff00", + "#d4cafe00", + "#c2b5f500", + "#aa99ec00", + "#6e56cf00", + "#654dc400", + "#6550b900", + "#2f265f00", + ], + light_alpha: [ + "#5500aa03", + "#4900ff07", + "#4400ee0f", + "#4300ff1b", + "#3600ff26", + "#3100fb35", + "#2d01dd4a", + "#2b00d066", + "#2400b7a9", + "#2300abb2", + "#1f0099af", + "#0b0043d9", + ], + dark: [ + "#14121f00", + "#1b152500", + "#291f4300", + "#33255b00", + "#3c2e6900", + "#47387600", + "#56468b00", + "#6958ad00", + "#6e56cf00", + "#7d66d900", + "#baa7ff00", + "#e2ddfe00", + ], + dark_alpha: [ + "#4422ff0f", + "#853ff916", + "#8354fe36", + "#7d51fd50", + "#845ffd5f", + "#8f6cfd6d", + "#9879ff83", + "#977dfea8", + "#8668ffcc", + "#9176fed7", + "#baa7ff00", + "#e3defffe", + ], + } +} + +fn iris() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Iris, + light: [ + "#fdfdff00", + "#f8f8ff00", + "#f0f1fe00", + "#e6e7ff00", + "#dadcff00", + "#cbcdff00", + "#b8baf800", + "#9b9ef000", + "#5b5bd600", + "#5151cd00", + "#5753c600", + "#27296200", + ], + light_alpha: [ + "#0000ff02", + "#0000ff07", + "#0011ee0f", + "#000bff19", + "#000eff25", + "#000aff34", + "#0008e647", + "#0008d964", + "#0000c0a4", + "#0000b6ae", + "#0600abac", + "#000246d8", + ], + dark: [ + "#13131e00", + "#17162500", + "#20224800", + "#262a6500", + "#30337400", + "#3d3e8200", + "#4a4a9500", + "#5958b100", + "#5b5bd600", + "#6e6ade00", + "#b1a9ff00", + "#e0dffe00", + ], + dark_alpha: [ + "#3636fe0e", + "#564bf916", + "#525bff3b", + "#4d58ff5a", + "#5b62fd6b", + "#6d6ffd7a", + "#7777fe8e", + "#7b7afeac", + "#6a6afed4", + "#7d79ffdc", + "#b1a9ff00", + "#e1e0fffe", + ], + } +} + +fn indigo() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Indigo, + light: [ + "#fdfdfe00", + "#f7f9ff00", + "#edf2fe00", + "#e1e9ff00", + "#d2deff00", + "#c1d0ff00", + "#abbdf900", + "#8da4ef00", + "#3e63dd00", + "#3358d400", + "#3a5bc700", + "#1f2d5c00", + ], + light_alpha: [ + "#00008002", + "#0040ff08", + "#0047f112", + "#0044ff1e", + "#0044ff2d", + "#003eff3e", + "#0037ed54", + "#0034dc72", + "#0031d2c1", + "#002ec9cc", + "#002bb7c5", + "#001046e0", + ], + dark: [ + "#11131f00", + "#14172600", + "#18244900", + "#1d2e6200", + "#25397400", + "#30438400", + "#3a4f9700", + "#435db100", + "#3e63dd00", + "#5472e400", + "#9eb1ff00", + "#d6e1ff00", + ], + dark_alpha: [ + "#1133ff0f", + "#3354fa17", + "#2f62ff3c", + "#3566ff57", + "#4171fd6b", + "#5178fd7c", + "#5a7fff90", + "#5b81feac", + "#4671ffdb", + "#5c7efee3", + "#9eb1ff00", + "#d6e1ff00", + ], + } +} + +fn blue() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Blue, + light: [ + "#fbfdff00", + "#f4faff00", + "#e6f4fe00", + "#d5efff00", + "#c2e5ff00", + "#acd8fc00", + "#8ec8f600", + "#5eb1ef00", + "#0090ff00", + "#0588f000", + "#0d74ce00", + "#11326400", + ], + light_alpha: [ + "#0080ff04", + "#008cff0b", + "#008ff519", + "#009eff2a", + "#0093ff3d", + "#0088f653", + "#0083eb71", + "#0084e6a1", + "#0090ff00", + "#0086f0fa", + "#006dcbf2", + "#002359ee", + ], + dark: [ + "#0d152000", + "#11192700", + "#0d284700", + "#00336200", + "#00407400", + "#104d8700", + "#205d9e00", + "#2870bd00", + "#0090ff00", + "#3b9eff00", + "#70b8ff00", + "#c2e6ff00", + ], + dark_alpha: [ + "#004df211", + "#1166fb18", + "#0077ff3a", + "#0075ff57", + "#0081fd6b", + "#0f89fd7f", + "#2a91fe98", + "#3094feb9", + "#0090ff00", + "#3b9eff00", + "#70b8ff00", + "#c2e6ff00", + ], + } +} + +fn cyan() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Cyan, + light: [ + "#fafdfe00", + "#f2fafb00", + "#def7f900", + "#caf1f600", + "#b5e9f000", + "#9ddde700", + "#7dcedc00", + "#3db9cf00", + "#00a2c700", + "#0797b900", + "#107d9800", + "#0d3c4800", + ], + light_alpha: [ + "#0099cc05", + "#009db10d", + "#00c2d121", + "#00bcd435", + "#01b4cc4a", + "#00a7c162", + "#009fbb82", + "#00a3c0c2", + "#00a2c700", + "#0094b7f8", + "#007491ef", + "#00323ef2", + ], + dark: [ + "#0b161a00", + "#101b2000", + "#082c3600", + "#00384800", + "#00455800", + "#04546800", + "#12677e00", + "#11809c00", + "#00a2c700", + "#23afd000", + "#4ccce600", + "#b6ecf700", + ], + dark_alpha: [ + "#0091f70a", + "#02a7f211", + "#00befd28", + "#00baff3b", + "#00befd4d", + "#00c7fd5e", + "#14cdff75", + "#11cfff95", + "#00cfffc3", + "#28d6ffcd", + "#52e1fee5", + "#bbf3fef7", + ], + } +} + +fn teal() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Teal, + light: [ + "#fafefd00", + "#f3fbf900", + "#e0f8f300", + "#ccf3ea00", + "#b8eae000", + "#a1ded200", + "#83cdc100", + "#53b9ab00", + "#12a59400", + "#0d9b8a00", + "#00857300", + "#0d3d3800", + ], + light_alpha: [ + "#00cc9905", + "#00aa800c", + "#00c69d1f", + "#00c39633", + "#00b49047", + "#00a6855e", + "#0099807c", + "#009783ac", + "#009e8ced", + "#009684f2", + "#00857300", + "#00332df2", + ], + dark: [ + "#0d151400", + "#111c1b00", + "#0d2d2a00", + "#023b3700", + "#08484300", + "#14575000", + "#1c696100", + "#207e7300", + "#12a59400", + "#0eb39e00", + "#0bd8b600", + "#adf0dd00", + ], + dark_alpha: [ + "#00deab05", + "#12fbe60c", + "#00ffe61e", + "#00ffe92d", + "#00ffea3b", + "#1cffe84b", + "#2efde85f", + "#32ffe775", + "#13ffe49f", + "#0dffe0ae", + "#0afed5d6", + "#b8ffebef", + ], + } +} + +fn jade() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Jade, + light: [ + "#fbfefd00", + "#f4fbf700", + "#e6f7ed00", + "#d6f1e300", + "#c3e9d700", + "#acdec800", + "#8bceb600", + "#56ba9f00", + "#29a38300", + "#26997b00", + "#20836800", + "#1d3b3100", + ], + light_alpha: [ + "#00c08004", + "#00a3460b", + "#00ae4819", + "#00a85129", + "#00a2553c", + "#009a5753", + "#00945f74", + "#00976ea9", + "#00916bd6", + "#008764d9", + "#007152df", + "#002217e2", + ], + dark: [ + "#0d151200", + "#121c1800", + "#0f2e2200", + "#0b3b2c00", + "#11483700", + "#1b574500", + "#24685400", + "#2a7e6800", + "#29a38300", + "#27b08b00", + "#1fd8a400", + "#adf0d400", + ], + dark_alpha: [ + "#00de4505", + "#27fba60c", + "#02f99920", + "#00ffaa2d", + "#11ffb63b", + "#34ffc24b", + "#45fdc75e", + "#48ffcf75", + "#38feca9d", + "#31fec7ab", + "#21fec0d6", + "#b8ffe1ef", + ], + } +} + +fn green() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Green, + light: [ + "#fbfefc00", + "#f4fbf600", + "#e6f6eb00", + "#d6f1df00", + "#c4e8d100", + "#adddc000", + "#8eceaa00", + "#5bb98b00", + "#30a46c00", + "#2b9a6600", + "#21835800", + "#193b2d00", + ], + light_alpha: [ + "#00c04004", + "#00a32f0b", + "#00a43319", + "#00a83829", + "#019c393b", + "#00963c52", + "#00914071", + "#00924ba4", + "#008f4acf", + "#008647d4", + "#00713fde", + "#002616e6", + ], + dark: [ + "#0e151200", + "#121b1700", + "#132d2100", + "#113b2900", + "#17493300", + "#20573e00", + "#28684a00", + "#2f7c5700", + "#30a46c00", + "#33b07400", + "#3dd68c00", + "#b1f1cb00", + ], + dark_alpha: [ + "#00de4505", + "#29f99d0b", + "#22ff991e", + "#11ff992d", + "#2bffa23c", + "#44ffaa4b", + "#50fdac5e", + "#54ffad73", + "#44ffa49e", + "#43fea4ab", + "#46fea5d4", + "#bbffd7f0", + ], + } +} + +fn grass() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Grass, + light: [ + "#fbfefb00", + "#f5fbf500", + "#e9f6e900", + "#daf1db00", + "#c9e8ca00", + "#b2ddb500", + "#94ce9a00", + "#65ba7400", + "#46a75800", + "#3e9b4f00", + "#2a7e3b00", + "#203c2500", + ], + light_alpha: [ + "#00c00004", + "#0099000a", + "#00970016", + "#009f0725", + "#00930536", + "#008f0a4d", + "#018b0f6b", + "#008d199a", + "#008619b9", + "#007b17c1", + "#006514d5", + "#002006df", + ], + dark: [ + "#0e151100", + "#141a1500", + "#1b2a1e00", + "#1d3a2400", + "#25482d00", + "#2d573600", + "#36674000", + "#3e794900", + "#46a75800", + "#53b36500", + "#71d08300", + "#c2f0c200", + ], + dark_alpha: [ + "#00de1205", + "#5ef7780a", + "#70fe8c1b", + "#57ff802c", + "#68ff8b3b", + "#71ff8f4b", + "#77fd925d", + "#77fd9070", + "#65ff82a1", + "#72ff8dae", + "#89ff9fcd", + "#ceffceef", + ], + } +} + +fn lime() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Lime, + light: [ + "#fcfdfa00", + "#f8faf300", + "#eef6d600", + "#e2f0bd00", + "#d3e7a600", + "#c2da9100", + "#abc97800", + "#8db65400", + "#bdee6300", + "#b0e64c00", + "#5c7c2f00", + "#37401c00", + ], + light_alpha: [ + "#66990005", + "#6b95000c", + "#96c80029", + "#8fc60042", + "#81bb0059", + "#72aa006e", + "#61990087", + "#559200ab", + "#93e4009c", + "#8fdc00b3", + "#375f00d0", + "#1e2900e3", + ], + dark: [ + "#11130c00", + "#151a1000", + "#1f291700", + "#29371d00", + "#33442300", + "#3d522a00", + "#49623100", + "#57753800", + "#bdee6300", + "#d4ff7000", + "#bde56c00", + "#e3f7ba00", + ], + dark_alpha: [ + "#11bb0003", + "#78f7000a", + "#9bfd4c1a", + "#a7fe5c29", + "#affe6537", + "#b2fe6d46", + "#b6ff6f57", + "#b6fd6d6c", + "#caff69ed", + "#d4ff7000", + "#d1fe77e4", + "#e9febff7", + ], + } +} + +fn mint() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Mint, + light: [ + "#f9fefd00", + "#f2fbf900", + "#ddf9f200", + "#c8f4e900", + "#b3ecde00", + "#9ce0d000", + "#7ecfbd00", + "#4cbba500", + "#86ead400", + "#7de0cb00", + "#02786400", + "#16433c00", + ], + light_alpha: [ + "#00d5aa06", + "#00b18a0d", + "#00d29e22", + "#00cc9937", + "#00c0914c", + "#00b08663", + "#00a17d81", + "#009e7fb3", + "#00d3a579", + "#00c39982", + "#007763fd", + "#00312ae9", + ], + dark: [ + "#0e151500", + "#0f1b1b00", + "#092c2b00", + "#003a3800", + "#00474400", + "#10565000", + "#1e685f00", + "#277f7000", + "#86ead400", + "#a8f5e500", + "#58d5ba00", + "#c4f5e100", + ], + dark_alpha: [ + "#00dede05", + "#00f9f90b", + "#00fff61d", + "#00fff42c", + "#00fff23a", + "#0effeb4a", + "#34fde55e", + "#41ffdf76", + "#92ffe7e9", + "#aefeedf5", + "#67ffded2", + "#cbfee9f5", + ], + } +} + +fn sky() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Sky, + light: [ + "#f9feff00", + "#f1fafd00", + "#e1f6fd00", + "#d1f0fa00", + "#bee7f500", + "#a9daed00", + "#8dcae300", + "#60b3d700", + "#7ce2fe00", + "#74daf800", + "#00749e00", + "#1d3e5600", + ], + light_alpha: [ + "#00d5ff06", + "#00a4db0e", + "#00b3ee1e", + "#00ace42e", + "#00a1d841", + "#0092ca56", + "#0089c172", + "#0085bf9f", + "#00c7fe83", + "#00bcf38b", + "#00749e00", + "#002540e2", + ], + dark: [ + "#0d141f00", + "#111a2700", + "#11284000", + "#11355500", + "#15446700", + "#1b537b00", + "#1f669200", + "#197cae00", + "#7ce2fe00", + "#a8eeff00", + "#75c7f000", + "#c2f3ff00", + ], + dark_alpha: [ + "#0044ff0f", + "#1171fb18", + "#1184fc33", + "#128fff49", + "#1c9dfd5d", + "#28a5ff72", + "#2badfe8b", + "#1db2fea9", + "#7ce3fffe", + "#a8eeff00", + "#7cd3ffef", + "#c2f3ff00", + ], + } +} + +fn black() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::Black, + light: [ + "#0000000d", + "#0000001a", + "#00000026", + "#00000033", + "#0000004d", + "#00000066", + "#00000080", + "#00000099", + "#000000b3", + "#000000cc", + "#000000e6", + "#000000f2", + ], + light_alpha: [ + "#0000000d", + "#0000001a", + "#00000026", + "#00000033", + "#0000004d", + "#00000066", + "#00000080", + "#00000099", + "#000000b3", + "#000000cc", + "#000000e6", + "#000000f2", + ], + dark: [ + "#0000000d", + "#0000001a", + "#00000026", + "#00000033", + "#0000004d", + "#00000066", + "#00000080", + "#00000099", + "#000000b3", + "#000000cc", + "#000000e6", + "#000000f2", + ], + dark_alpha: [ + "#0000000d", + "#0000001a", + "#00000026", + "#00000033", + "#0000004d", + "#00000066", + "#00000080", + "#00000099", + "#000000b3", + "#000000cc", + "#000000e6", + "#000000f2", + ], + } +} + +fn white() -> DefaultColorScaleSet { + DefaultColorScaleSet { + scale: ColorScaleName::White, + light: [ + "#ffffff0d", + "#ffffff1a", + "#ffffff26", + "#ffffff33", + "#ffffff4d", + "#ffffff66", + "#ffffff80", + "#ffffff99", + "#ffffffb3", + "#ffffffcc", + "#ffffffe6", + "#fffffff2", + ], + light_alpha: [ + "#ffffff0d", + "#ffffff1a", + "#ffffff26", + "#ffffff33", + "#ffffff4d", + "#ffffff66", + "#ffffff80", + "#ffffff99", + "#ffffffb3", + "#ffffffcc", + "#ffffffe6", + "#fffffff2", + ], + dark: [ + "#ffffff0d", + "#ffffff1a", + "#ffffff26", + "#ffffff33", + "#ffffff4d", + "#ffffff66", + "#ffffff80", + "#ffffff99", + "#ffffffb3", + "#ffffffcc", + "#ffffffe6", + "#fffffff2", + ], + dark_alpha: [ + "#ffffff0d", + "#ffffff1a", + "#ffffff26", + "#ffffff33", + "#ffffff4d", + "#ffffff66", + "#ffffff80", + "#ffffff99", + "#ffffffb3", + "#ffffffcc", + "#ffffffe6", + "#fffffff2", + ], + } +} From b128377cd2459659ec4e6d3bd102b03cbd82cad4 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 30 Oct 2023 17:03:33 -0400 Subject: [PATCH 3/6] Register all of the color scales --- crates/theme2/src/default.rs | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/crates/theme2/src/default.rs b/crates/theme2/src/default.rs index cdfd135885eebbf55809403307effc5af569e118..5aa569325ad9f8cb08ce5f82a6ac403ae97910b3 100644 --- a/crates/theme2/src/default.rs +++ b/crates/theme2/src/default.rs @@ -35,7 +35,41 @@ impl From for ColorScaleSet { pub fn default_color_scales() -> ColorScales { use ColorScaleName::*; - HashMap::from_iter([(Red, red().into())]) + HashMap::from_iter([ + (Gray, gray().into()), + (Mauve, mauve().into()), + (Slate, slate().into()), + (Sage, sage().into()), + (Olive, olive().into()), + (Sand, sand().into()), + (Gold, gold().into()), + (Bronze, bronze().into()), + (Brown, brown().into()), + (Yellow, yellow().into()), + (Amber, amber().into()), + (Orange, orange().into()), + (Tomato, tomato().into()), + (Red, red().into()), + (Ruby, ruby().into()), + (Crimson, crimson().into()), + (Pink, pink().into()), + (Plum, plum().into()), + (Purple, purple().into()), + (Violet, violet().into()), + (Iris, iris().into()), + (Indigo, indigo().into()), + (Blue, blue().into()), + (Cyan, cyan().into()), + (Teal, teal().into()), + (Jade, jade().into()), + (Green, green().into()), + (Grass, grass().into()), + (Lime, lime().into()), + (Mint, mint().into()), + (Sky, sky().into()), + (Black, black().into()), + (White, white().into()), + ]) } fn gray() -> DefaultColorScaleSet { From e0f68c77b02cb3b144761075ddb959260f79a7b3 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 30 Oct 2023 17:08:37 -0400 Subject: [PATCH 4/6] Add type alias for steps in color scales --- crates/theme2/src/scale.rs | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/crates/theme2/src/scale.rs b/crates/theme2/src/scale.rs index a7bd6a5e22fe76c0f47d9062aa68a9f014f001da..3aea4762285e66394c3f1ef455b9661e74a3a689 100644 --- a/crates/theme2/src/scale.rs +++ b/crates/theme2/src/scale.rs @@ -89,6 +89,9 @@ pub type ColorScale = [Hsla; 12]; pub type ColorScales = HashMap; +/// A one-based step in a [`ColorScale`]. +pub type ColorScaleStep = usize; + pub struct ColorScaleSet { name: ColorScaleName, light: ColorScale, @@ -118,19 +121,19 @@ impl ColorScaleSet { self.name.to_string() } - pub fn light(&self, step: usize) -> Hsla { + pub fn light(&self, step: ColorScaleStep) -> Hsla { self.light[step - 1] } - pub fn light_alpha(&self, step: usize) -> Hsla { + pub fn light_alpha(&self, step: ColorScaleStep) -> Hsla { self.light_alpha[step - 1] } - pub fn dark(&self, step: usize) -> Hsla { + pub fn dark(&self, step: ColorScaleStep) -> Hsla { self.dark[step - 1] } - pub fn dark_alpha(&self, step: usize) -> Hsla { + pub fn dark_alpha(&self, step: ColorScaleStep) -> Hsla { self.dark[step - 1] } @@ -143,24 +146,20 @@ impl ColorScaleSet { } } - /// Returns the one-based step in the scale. - /// - /// We usually reference steps as 1-12 instead of 0-11, so we - /// automatically subtract 1 from the index. - pub fn step(self, cx: &AppContext, index: usize) -> Hsla { + pub fn step(self, cx: &AppContext, step: ColorScaleStep) -> Hsla { let appearance = Self::current_appearance(cx); match appearance { - Appearance::Light => self.light(index), - Appearance::Dark => self.dark(index), + Appearance::Light => self.light(step), + Appearance::Dark => self.dark(step), } } - pub fn step_alpha(self, cx: &AppContext, index: usize) -> Hsla { + pub fn step_alpha(self, cx: &AppContext, step: ColorScaleStep) -> Hsla { let appearance = Self::current_appearance(cx); match appearance { - Appearance::Light => self.light_alpha(index), - Appearance::Dark => self.dark_alpha(index), + Appearance::Light => self.light_alpha(step), + Appearance::Dark => self.dark_alpha(step), } } } From 991f58409e441130dd2678c3835e8b536b805046 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 30 Oct 2023 17:20:43 -0400 Subject: [PATCH 5/6] Fix alpha channel values for color scales --- crates/theme2/src/default.rs | 1560 +++++++++++++++++----------------- 1 file changed, 780 insertions(+), 780 deletions(-) diff --git a/crates/theme2/src/default.rs b/crates/theme2/src/default.rs index 5aa569325ad9f8cb08ce5f82a6ac403ae97910b3..e3a0527f110697867f82053c24ae2262f0b566d3 100644 --- a/crates/theme2/src/default.rs +++ b/crates/theme2/src/default.rs @@ -76,18 +76,18 @@ fn gray() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Gray, light: [ - "#fcfcfc00", - "#f9f9f900", - "#f0f0f000", - "#e8e8e800", - "#e0e0e000", - "#d9d9d900", - "#cecece00", - "#bbbbbb00", - "#8d8d8d00", - "#83838300", - "#64646400", - "#20202000", + "#fcfcfcff", + "#f9f9f9ff", + "#f0f0f0ff", + "#e8e8e8ff", + "#e0e0e0ff", + "#d9d9d9ff", + "#cececeff", + "#bbbbbbff", + "#8d8d8dff", + "#838383ff", + "#646464ff", + "#202020ff", ], light_alpha: [ "#00000003", @@ -104,18 +104,18 @@ fn gray() -> DefaultColorScaleSet { "#000000df", ], dark: [ - "#11111100", - "#19191900", - "#22222200", - "#2a2a2a00", - "#31313100", - "#3a3a3a00", - "#48484800", - "#60606000", - "#6e6e6e00", - "#7b7b7b00", - "#b4b4b400", - "#eeeeee00", + "#111111ff", + "#191919ff", + "#222222ff", + "#2a2a2aff", + "#313131ff", + "#3a3a3aff", + "#484848ff", + "#606060ff", + "#6e6e6eff", + "#7b7b7bff", + "#b4b4b4ff", + "#eeeeeeff", ], dark_alpha: [ "#00000000", @@ -138,18 +138,18 @@ fn mauve() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Mauve, light: [ - "#fdfcfd00", - "#faf9fb00", - "#f2eff300", - "#eae7ec00", - "#e3dfe600", - "#dbd8e000", - "#d0cdd700", - "#bcbac700", - "#8e8c9900", - "#84828e00", - "#65636d00", - "#211f2600", + "#fdfcfdff", + "#faf9fbff", + "#f2eff3ff", + "#eae7ecff", + "#e3dfe6ff", + "#dbd8e0ff", + "#d0cdd7ff", + "#bcbac7ff", + "#8e8c99ff", + "#84828eff", + "#65636dff", + "#211f26ff", ], light_alpha: [ "#55005503", @@ -166,18 +166,18 @@ fn mauve() -> DefaultColorScaleSet { "#020008e0", ], dark: [ - "#12111300", - "#1a191b00", - "#23222500", - "#2b292d00", - "#32303500", - "#3c393f00", - "#49474e00", - "#625f6900", - "#6f6d7800", - "#7c7a8500", - "#b5b2bc00", - "#eeeef000", + "#121113ff", + "#1a191bff", + "#232225ff", + "#2b292dff", + "#323035ff", + "#3c393fff", + "#49474eff", + "#625f69ff", + "#6f6d78ff", + "#7c7a85ff", + "#b5b2bcff", + "#eeeef0ff", ], dark_alpha: [ "#00000000", @@ -200,18 +200,18 @@ fn slate() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Slate, light: [ - "#fcfcfd00", - "#f9f9fb00", - "#f0f0f300", - "#e8e8ec00", - "#e0e1e600", - "#d9d9e000", - "#cdced600", - "#b9bbc600", - "#8b8d9800", - "#80838d00", - "#60646c00", - "#1c202400", + "#fcfcfdff", + "#f9f9fbff", + "#f0f0f3ff", + "#e8e8ecff", + "#e0e1e6ff", + "#d9d9e0ff", + "#cdced6ff", + "#b9bbc6ff", + "#8b8d98ff", + "#80838dff", + "#60646cff", + "#1c2024ff", ], light_alpha: [ "#00005503", @@ -228,18 +228,18 @@ fn slate() -> DefaultColorScaleSet { "#000509e3", ], dark: [ - "#11111300", - "#18191b00", - "#21222500", - "#272a2d00", - "#2e313500", - "#363a3f00", - "#43484e00", - "#5a616900", - "#696e7700", - "#777b8400", - "#b0b4ba00", - "#edeef000", + "#111113ff", + "#18191bff", + "#212225ff", + "#272a2dff", + "#2e3135ff", + "#363a3fff", + "#43484eff", + "#5a6169ff", + "#696e77ff", + "#777b84ff", + "#b0b4baff", + "#edeef0ff", ], dark_alpha: [ "#00000000", @@ -262,18 +262,18 @@ fn sage() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Sage, light: [ - "#fbfdfc00", - "#f7f9f800", - "#eef1f000", - "#e6e9e800", - "#dfe2e000", - "#d7dad900", - "#cbcfcd00", - "#b8bcba00", - "#868e8b00", - "#7c848100", - "#5f656300", - "#1a211e00", + "#fbfdfcff", + "#f7f9f8ff", + "#eef1f0ff", + "#e6e9e8ff", + "#dfe2e0ff", + "#d7dad9ff", + "#cbcfcdff", + "#b8bcbaff", + "#868e8bff", + "#7c8481ff", + "#5f6563ff", + "#1a211eff", ], light_alpha: [ "#00804004", @@ -290,18 +290,18 @@ fn sage() -> DefaultColorScaleSet { "#000805e5", ], dark: [ - "#10121100", - "#17191800", - "#20222100", - "#272a2900", - "#2e313000", - "#373b3900", - "#44494700", - "#5b625f00", - "#63706b00", - "#717d7900", - "#adb5b200", - "#eceeed00", + "#101211ff", + "#171918ff", + "#202221ff", + "#272a29ff", + "#2e3130ff", + "#373b39ff", + "#444947ff", + "#5b625fff", + "#63706bff", + "#717d79ff", + "#adb5b2ff", + "#eceeedff", ], dark_alpha: [ "#00000000", @@ -324,18 +324,18 @@ fn olive() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Olive, light: [ - "#fcfdfc00", - "#f8faf800", - "#eff1ef00", - "#e7e9e700", - "#dfe2df00", - "#d7dad700", - "#cccfcc00", - "#b9bcb800", - "#898e8700", - "#7f847d00", - "#60655f00", - "#1d211c00", + "#fcfdfcff", + "#f8faf8ff", + "#eff1efff", + "#e7e9e7ff", + "#dfe2dfff", + "#d7dad7ff", + "#cccfccff", + "#b9bcb8ff", + "#898e87ff", + "#7f847dff", + "#60655fff", + "#1d211cff", ], light_alpha: [ "#00550003", @@ -352,18 +352,18 @@ fn olive() -> DefaultColorScaleSet { "#010600e3", ], dark: [ - "#11121000", - "#18191700", - "#21222000", - "#282a2700", - "#2f312e00", - "#383a3600", - "#45484300", - "#5c625b00", - "#68706600", - "#767d7400", - "#afb5ad00", - "#eceeec00", + "#111210ff", + "#181917ff", + "#212220ff", + "#282a27ff", + "#2f312eff", + "#383a36ff", + "#454843ff", + "#5c625bff", + "#687066ff", + "#767d74ff", + "#afb5adff", + "#eceeecff", ], dark_alpha: [ "#00000000", @@ -386,18 +386,18 @@ fn sand() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Sand, light: [ - "#fdfdfc00", - "#f9f9f800", - "#f1f0ef00", - "#e9e8e600", - "#e2e1de00", - "#dad9d600", - "#cfceca00", - "#bcbbb500", - "#8d8d8600", - "#82827c00", - "#63635e00", - "#21201c00", + "#fdfdfcff", + "#f9f9f8ff", + "#f1f0efff", + "#e9e8e6ff", + "#e2e1deff", + "#dad9d6ff", + "#cfcecaff", + "#bcbbb5ff", + "#8d8d86ff", + "#82827cff", + "#63635eff", + "#21201cff", ], light_alpha: [ "#55550003", @@ -414,18 +414,18 @@ fn sand() -> DefaultColorScaleSet { "#060500e3", ], dark: [ - "#11111000", - "#19191800", - "#22222100", - "#2a2a2800", - "#31312e00", - "#3b3a3700", - "#49484400", - "#62605b00", - "#6f6d6600", - "#7c7b7400", - "#b5b3ad00", - "#eeeeec00", + "#111110ff", + "#191918ff", + "#222221ff", + "#2a2a28ff", + "#31312eff", + "#3b3a37ff", + "#494844ff", + "#62605bff", + "#6f6d66ff", + "#7c7b74ff", + "#b5b3adff", + "#eeeeecff", ], dark_alpha: [ "#00000000", @@ -448,18 +448,18 @@ fn gold() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Gold, light: [ - "#fdfdfc00", - "#faf9f200", - "#f2f0e700", - "#eae6db00", - "#e1dccf00", - "#d8d0bf00", - "#cbc0aa00", - "#b9a88d00", - "#97836500", - "#8c7a5e00", - "#71624b00", - "#3b352b00", + "#fdfdfcff", + "#faf9f2ff", + "#f2f0e7ff", + "#eae6dbff", + "#e1dccfff", + "#d8d0bfff", + "#cbc0aaff", + "#b9a88dff", + "#978365ff", + "#8c7a5eff", + "#71624bff", + "#3b352bff", ], light_alpha: [ "#55550003", @@ -476,18 +476,18 @@ fn gold() -> DefaultColorScaleSet { "#130c00d4", ], dark: [ - "#12121100", - "#1b1a1700", - "#24231f00", - "#2d2b2600", - "#38352e00", - "#44403900", - "#544f4600", - "#69625600", - "#97836500", - "#a3907300", - "#cbb99f00", - "#e8e2d900", + "#121211ff", + "#1b1a17ff", + "#24231fff", + "#2d2b26ff", + "#38352eff", + "#444039ff", + "#544f46ff", + "#696256ff", + "#978365ff", + "#a39073ff", + "#cbb99fff", + "#e8e2d9ff", ], dark_alpha: [ "#91911102", @@ -510,18 +510,18 @@ fn bronze() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Bronze, light: [ - "#fdfcfc00", - "#fdf7f500", - "#f6edea00", - "#efe4df00", - "#e7d9d300", - "#dfcdc500", - "#d3bcb300", - "#c2a49900", - "#a1807200", - "#95746800", - "#7d5e5400", - "#43302b00", + "#fdfcfcff", + "#fdf7f5ff", + "#f6edeaff", + "#efe4dfff", + "#e7d9d3ff", + "#dfcdc5ff", + "#d3bcb3ff", + "#c2a499ff", + "#a18072ff", + "#957468ff", + "#7d5e54ff", + "#43302bff", ], light_alpha: [ "#55000003", @@ -538,18 +538,18 @@ fn bronze() -> DefaultColorScaleSet { "#1d0600d4", ], dark: [ - "#14111000", - "#1c191700", - "#26222000", - "#302a2700", - "#3b333000", - "#493e3a00", - "#5a4c4700", - "#6f5f5800", - "#a1807200", - "#ae8c7e00", - "#d4b3a500", - "#ede0d900", + "#141110ff", + "#1c1917ff", + "#262220ff", + "#302a27ff", + "#3b3330ff", + "#493e3aff", + "#5a4c47ff", + "#6f5f58ff", + "#a18072ff", + "#ae8c7eff", + "#d4b3a5ff", + "#ede0d9ff", ], dark_alpha: [ "#d1110004", @@ -572,18 +572,18 @@ fn brown() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Brown, light: [ - "#fefdfc00", - "#fcf9f600", - "#f6eee700", - "#f0e4d900", - "#ebdaca00", - "#e4cdb700", - "#dcbc9f00", - "#cea37e00", - "#ad7f5800", - "#a0755300", - "#815e4600", - "#3e332e00", + "#fefdfcff", + "#fcf9f6ff", + "#f6eee7ff", + "#f0e4d9ff", + "#ebdacaff", + "#e4cdb7ff", + "#dcbc9fff", + "#cea37eff", + "#ad7f58ff", + "#a07553ff", + "#815e46ff", + "#3e332eff", ], light_alpha: [ "#aa550003", @@ -600,18 +600,18 @@ fn brown() -> DefaultColorScaleSet { "#140600d1", ], dark: [ - "#12110f00", - "#1c181600", - "#28211d00", - "#32292200", - "#3e312800", - "#4d3c2f00", - "#614a3900", - "#7c5f4600", - "#ad7f5800", - "#b88c6700", - "#dbb59400", - "#f2e1ca00", + "#12110fff", + "#1c1816ff", + "#28211dff", + "#322922ff", + "#3e3128ff", + "#4d3c2fff", + "#614a39ff", + "#7c5f46ff", + "#ad7f58ff", + "#b88c67ff", + "#dbb594ff", + "#f2e1caff", ], dark_alpha: [ "#91110002", @@ -634,18 +634,18 @@ fn yellow() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Yellow, light: [ - "#fdfdf900", - "#fefce900", - "#fffab800", - "#fff39400", - "#ffe77000", - "#f3d76800", - "#e4c76700", - "#d5ae3900", - "#ffe62900", - "#ffdc0000", - "#9e6c0000", - "#473b1f00", + "#fdfdf9ff", + "#fefce9ff", + "#fffab8ff", + "#fff394ff", + "#ffe770ff", + "#f3d768ff", + "#e4c767ff", + "#d5ae39ff", + "#ffe629ff", + "#ffdc00ff", + "#9e6c00ff", + "#473b1fff", ], light_alpha: [ "#aaaa0006", @@ -657,23 +657,23 @@ fn yellow() -> DefaultColorScaleSet { "#d2a10098", "#c99700c6", "#ffe100d6", - "#ffdc0000", - "#9e6c0000", + "#ffdc00ff", + "#9e6c00ff", "#2e2000e0", ], dark: [ - "#14120b00", - "#1b180f00", - "#2d230500", - "#362b0000", - "#43350000", - "#52420200", - "#66541700", - "#836a2100", - "#ffe62900", - "#ffff5700", - "#f5e14700", - "#f6eeb400", + "#14120bff", + "#1b180fff", + "#2d2305ff", + "#362b00ff", + "#433500ff", + "#524202ff", + "#665417ff", + "#836a21ff", + "#ffe629ff", + "#ffff57ff", + "#f5e147ff", + "#f6eeb4ff", ], dark_alpha: [ "#d1510004", @@ -684,8 +684,8 @@ fn yellow() -> DefaultColorScaleSet { "#fec40046", "#fdcb225c", "#fdca327b", - "#ffe62900", - "#ffff5700", + "#ffe629ff", + "#ffff57ff", "#fee949f5", "#fef6baf6", ], @@ -696,18 +696,18 @@ fn amber() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Amber, light: [ - "#fefdfb00", - "#fefbe900", - "#fff7c200", - "#ffee9c00", - "#fbe57700", - "#f3d67300", - "#e9c16200", - "#e2a33600", - "#ffc53d00", - "#ffba1800", - "#ab640000", - "#4f342200", + "#fefdfbff", + "#fefbe9ff", + "#fff7c2ff", + "#ffee9cff", + "#fbe577ff", + "#f3d673ff", + "#e9c162ff", + "#e2a336ff", + "#ffc53dff", + "#ffba18ff", + "#ab6400ff", + "#4f3422ff", ], light_alpha: [ "#c0800004", @@ -720,22 +720,22 @@ fn amber() -> DefaultColorScaleSet { "#da8a00c9", "#ffb300c2", "#ffb300e7", - "#ab640000", + "#ab6400ff", "#341500dd", ], dark: [ - "#16120c00", - "#1d180f00", - "#30200800", - "#3f270000", - "#4d300000", - "#5c3d0500", - "#714f1900", - "#8f642400", - "#ffc53d00", - "#ffd60a00", - "#ffca1600", - "#ffe7b300", + "#16120cff", + "#1d180fff", + "#302008ff", + "#3f2700ff", + "#4d3000ff", + "#5c3d05ff", + "#714f19ff", + "#8f6424ff", + "#ffc53dff", + "#ffd60aff", + "#ffca16ff", + "#ffe7b3ff", ], dark_alpha: [ "#e63c0006", @@ -746,10 +746,10 @@ fn amber() -> DefaultColorScaleSet { "#fd9b0051", "#ffab2567", "#ffae3587", - "#ffc53d00", - "#ffd60a00", - "#ffca1600", - "#ffe7b300", + "#ffc53dff", + "#ffd60aff", + "#ffca16ff", + "#ffe7b3ff", ], } } @@ -758,18 +758,18 @@ fn orange() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Orange, light: [ - "#fefcfb00", - "#fff7ed00", - "#ffefd600", - "#ffdfb500", - "#ffd19a00", - "#ffc18200", - "#f5ae7300", - "#ec945500", - "#f76b1500", - "#ef5f0000", - "#cc4e0000", - "#582d1d00", + "#fefcfbff", + "#fff7edff", + "#ffefd6ff", + "#ffdfb5ff", + "#ffd19aff", + "#ffc182ff", + "#f5ae73ff", + "#ec9455ff", + "#f76b15ff", + "#ef5f00ff", + "#cc4e00ff", + "#582d1dff", ], light_alpha: [ "#c0400004", @@ -781,23 +781,23 @@ fn orange() -> DefaultColorScaleSet { "#ed6c008c", "#e35f00aa", "#f65e00ea", - "#ef5f0000", - "#cc4e0000", + "#ef5f00ff", + "#cc4e00ff", "#431200e2", ], dark: [ - "#17120e00", - "#1e160f00", - "#331e0b00", - "#46210000", - "#56280000", - "#66350c00", - "#7e451d00", - "#a3582900", - "#f76b1500", - "#ff801f00", - "#ffa05700", - "#ffe0c200", + "#17120eff", + "#1e160fff", + "#331e0bff", + "#462100ff", + "#562800ff", + "#66350cff", + "#7e451dff", + "#a35829ff", + "#f76b15ff", + "#ff801fff", + "#ffa057ff", + "#ffe0c2ff", ], dark_alpha: [ "#ec360007", @@ -809,9 +809,9 @@ fn orange() -> DefaultColorScaleSet { "#ff832c75", "#fe84389d", "#fe6d15f7", - "#ff801f00", - "#ffa05700", - "#ffe0c200", + "#ff801fff", + "#ffa057ff", + "#ffe0c2ff", ], } } @@ -820,18 +820,18 @@ fn tomato() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Tomato, light: [ - "#fffcfc00", - "#fff8f700", - "#feebe700", - "#ffdcd300", - "#ffcdc200", - "#fdbdaf00", - "#f5a89800", - "#ec8e7b00", - "#e54d2e00", - "#dd442500", - "#d1341500", - "#5c271f00", + "#fffcfcff", + "#fff8f7ff", + "#feebe7ff", + "#ffdcd3ff", + "#ffcdc2ff", + "#fdbdafff", + "#f5a898ff", + "#ec8e7bff", + "#e54d2eff", + "#dd4425ff", + "#d13415ff", + "#5c271fff", ], light_alpha: [ "#ff000003", @@ -848,18 +848,18 @@ fn tomato() -> DefaultColorScaleSet { "#460900e0", ], dark: [ - "#18111100", - "#1f151300", - "#39171400", - "#4e151100", - "#5e1c1600", - "#6e292000", - "#853a2d00", - "#ac4d3900", - "#e54d2e00", - "#ec614200", - "#ff977d00", - "#fbd3cb00", + "#181111ff", + "#1f1513ff", + "#391714ff", + "#4e1511ff", + "#5e1c16ff", + "#6e2920ff", + "#853a2dff", + "#ac4d39ff", + "#e54d2eff", + "#ec6142ff", + "#ff977dff", + "#fbd3cbff", ], dark_alpha: [ "#f1121208", @@ -872,7 +872,7 @@ fn tomato() -> DefaultColorScaleSet { "#fe6d4ea7", "#fe5431e4", "#ff6847eb", - "#ff977d00", + "#ff977dff", "#ffd6cefb", ], } @@ -882,18 +882,18 @@ fn red() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Red, light: [ - "#fffcfc00", - "#fff7f700", - "#feebec00", - "#ffdbdc00", - "#ffcdce00", - "#fdbdbe00", - "#f4a9aa00", - "#eb8e9000", - "#e5484d00", - "#dc3e4200", - "#ce2c3100", - "#64172300", + "#fffcfcff", + "#fff7f7ff", + "#feebecff", + "#ffdbdcff", + "#ffcdceff", + "#fdbdbeff", + "#f4a9aaff", + "#eb8e90ff", + "#e5484dff", + "#dc3e42ff", + "#ce2c31ff", + "#641723ff", ], light_alpha: [ "#ff000003", @@ -910,18 +910,18 @@ fn red() -> DefaultColorScaleSet { "#55000de8", ], dark: [ - "#19111100", - "#20131400", - "#3b121900", - "#500f1c00", - "#61162300", - "#72232d00", - "#8c333a00", - "#b5454800", - "#e5484d00", - "#ec5d5e00", - "#ff959200", - "#ffd1d900", + "#191111ff", + "#201314ff", + "#3b1219ff", + "#500f1cff", + "#611623ff", + "#72232dff", + "#8c333aff", + "#b54548ff", + "#e5484dff", + "#ec5d5eff", + "#ff9592ff", + "#ffd1d9ff", ], dark_alpha: [ "#f4121209", @@ -934,8 +934,8 @@ fn red() -> DefaultColorScaleSet { "#ff5d61b0", "#fe4e54e4", "#ff6465eb", - "#ff959200", - "#ffd1d900", + "#ff9592ff", + "#ffd1d9ff", ], } } @@ -944,18 +944,18 @@ fn ruby() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Ruby, light: [ - "#fffcfd00", - "#fff7f800", - "#feeaed00", - "#ffdce100", - "#ffced600", - "#f8bfc800", - "#efacb800", - "#e592a300", - "#e5466600", - "#dc3b5d00", - "#ca244d00", - "#64172b00", + "#fffcfdff", + "#fff7f8ff", + "#feeaedff", + "#ffdce1ff", + "#ffced6ff", + "#f8bfc8ff", + "#efacb8ff", + "#e592a3ff", + "#e54666ff", + "#dc3b5dff", + "#ca244dff", + "#64172bff", ], light_alpha: [ "#ff005503", @@ -972,18 +972,18 @@ fn ruby() -> DefaultColorScaleSet { "#550016e8", ], dark: [ - "#19111300", - "#1e151700", - "#3a141e00", - "#4e132500", - "#5e1a2e00", - "#6f253900", - "#88344700", - "#b3445a00", - "#e5466600", - "#ec5a7200", - "#ff949d00", - "#fed2e100", + "#191113ff", + "#1e1517ff", + "#3a141eff", + "#4e1325ff", + "#5e1a2eff", + "#6f2539ff", + "#883447ff", + "#b3445aff", + "#e54666ff", + "#ec5a72ff", + "#ff949dff", + "#fed2e1ff", ], dark_alpha: [ "#f4124a09", @@ -996,7 +996,7 @@ fn ruby() -> DefaultColorScaleSet { "#ff5c7cae", "#fe4c70e4", "#ff617beb", - "#ff949d00", + "#ff949dff", "#ffd3e2fe", ], } @@ -1006,18 +1006,18 @@ fn crimson() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Crimson, light: [ - "#fffcfd00", - "#fef7f900", - "#ffe9f000", - "#fedce700", - "#facedd00", - "#f3bed100", - "#eaacc300", - "#e093b200", - "#e93d8200", - "#df347800", - "#cb1d6300", - "#62163900", + "#fffcfdff", + "#fef7f9ff", + "#ffe9f0ff", + "#fedce7ff", + "#faceddff", + "#f3bed1ff", + "#eaacc3ff", + "#e093b2ff", + "#e93d82ff", + "#df3478ff", + "#cb1d63ff", + "#621639ff", ], light_alpha: [ "#ff005503", @@ -1034,18 +1034,18 @@ fn crimson() -> DefaultColorScaleSet { "#530026e9", ], dark: [ - "#19111400", - "#20131800", - "#38152500", - "#4d122f00", - "#5c183900", - "#6d254500", - "#87335600", - "#b0436e00", - "#e93d8200", - "#ee518a00", - "#ff92ad00", - "#fdd3e800", + "#191114ff", + "#201318ff", + "#381525ff", + "#4d122fff", + "#5c1839ff", + "#6d2545ff", + "#873356ff", + "#b0436eff", + "#e93d82ff", + "#ee518aff", + "#ff92adff", + "#fdd3e8ff", ], dark_alpha: [ "#f4126709", @@ -1058,7 +1058,7 @@ fn crimson() -> DefaultColorScaleSet { "#fe5b9bab", "#fe418de8", "#ff5693ed", - "#ff92ad00", + "#ff92adff", "#ffd5eafd", ], } @@ -1068,18 +1068,18 @@ fn pink() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Pink, light: [ - "#fffcfe00", - "#fef7fb00", - "#fee9f500", - "#fbdcef00", - "#f6cee700", - "#efbfdd00", - "#e7acd000", - "#dd93c200", - "#d6409f00", - "#cf389700", - "#c2298a00", - "#65124900", + "#fffcfeff", + "#fef7fbff", + "#fee9f5ff", + "#fbdcefff", + "#f6cee7ff", + "#efbfddff", + "#e7acd0ff", + "#dd93c2ff", + "#d6409fff", + "#cf3897ff", + "#c2298aff", + "#651249ff", ], light_alpha: [ "#ff00aa03", @@ -1096,18 +1096,18 @@ fn pink() -> DefaultColorScaleSet { "#59003bed", ], dark: [ - "#19111700", - "#21121d00", - "#37172f00", - "#4b143d00", - "#591c4700", - "#69295500", - "#83386900", - "#a8488500", - "#d6409f00", - "#de51a800", - "#ff8dcc00", - "#fdd1ea00", + "#191117ff", + "#21121dff", + "#37172fff", + "#4b143dff", + "#591c47ff", + "#692955ff", + "#833869ff", + "#a84885ff", + "#d6409fff", + "#de51a8ff", + "#ff8dccff", + "#fdd1eaff", ], dark_alpha: [ "#f412bc09", @@ -1120,7 +1120,7 @@ fn pink() -> DefaultColorScaleSet { "#ff68c8a2", "#fe49bcd4", "#ff5cc0dc", - "#ff8dcc00", + "#ff8dccff", "#ffd3ecfd", ], } @@ -1130,18 +1130,18 @@ fn plum() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Plum, light: [ - "#fefcff00", - "#fdf7fd00", - "#fbebfb00", - "#f7def800", - "#f2d1f300", - "#e9c2ec00", - "#deade300", - "#cf91d800", - "#ab4aba00", - "#a144af00", - "#953ea300", - "#53195d00", + "#fefcffff", + "#fdf7fdff", + "#fbebfbff", + "#f7def8ff", + "#f2d1f3ff", + "#e9c2ecff", + "#deade3ff", + "#cf91d8ff", + "#ab4abaff", + "#a144afff", + "#953ea3ff", + "#53195dff", ], light_alpha: [ "#aa00ff03", @@ -1158,18 +1158,18 @@ fn plum() -> DefaultColorScaleSet { "#40004be6", ], dark: [ - "#18111800", - "#20132000", - "#351a3500", - "#451d4700", - "#51245400", - "#5e306100", - "#73407900", - "#92549c00", - "#ab4aba00", - "#b658c400", - "#e796f300", - "#f4d4f400", + "#181118ff", + "#201320ff", + "#351a35ff", + "#451d47ff", + "#512454ff", + "#5e3061ff", + "#734079ff", + "#92549cff", + "#ab4abaff", + "#b658c4ff", + "#e796f3ff", + "#f4d4f4ff", ], dark_alpha: [ "#f112f108", @@ -1192,18 +1192,18 @@ fn purple() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Purple, light: [ - "#fefcfe00", - "#fbf7fe00", - "#f7edfe00", - "#f2e2fc00", - "#ead5f900", - "#e0c4f400", - "#d1afec00", - "#be93e400", - "#8e4ec600", - "#8347b900", - "#8145b500", - "#40206000", + "#fefcfeff", + "#fbf7feff", + "#f7edfeff", + "#f2e2fcff", + "#ead5f9ff", + "#e0c4f4ff", + "#d1afecff", + "#be93e4ff", + "#8e4ec6ff", + "#8347b9ff", + "#8145b5ff", + "#402060ff", ], light_alpha: [ "#aa00aa03", @@ -1220,18 +1220,18 @@ fn purple() -> DefaultColorScaleSet { "#250049df", ], dark: [ - "#18111b00", - "#1e152300", - "#301c3b00", - "#3d224e00", - "#48295c00", - "#54346b00", - "#66428200", - "#8457aa00", - "#8e4ec600", - "#9a5cd000", - "#d19dff00", - "#ecd9fa00", + "#18111bff", + "#1e1523ff", + "#301c3bff", + "#3d224eff", + "#48295cff", + "#54346bff", + "#664282ff", + "#8457aaff", + "#8e4ec6ff", + "#9a5cd0ff", + "#d19dffff", + "#ecd9faff", ], dark_alpha: [ "#b412f90b", @@ -1244,7 +1244,7 @@ fn purple() -> DefaultColorScaleSet { "#c47effa4", "#b661ffc2", "#bc6fffcd", - "#d19dff00", + "#d19dffff", "#f1ddfffa", ], } @@ -1254,18 +1254,18 @@ fn violet() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Violet, light: [ - "#fdfcfe00", - "#faf8ff00", - "#f4f0fe00", - "#ebe4ff00", - "#e1d9ff00", - "#d4cafe00", - "#c2b5f500", - "#aa99ec00", - "#6e56cf00", - "#654dc400", - "#6550b900", - "#2f265f00", + "#fdfcfeff", + "#faf8ffff", + "#f4f0feff", + "#ebe4ffff", + "#e1d9ffff", + "#d4cafeff", + "#c2b5f5ff", + "#aa99ecff", + "#6e56cfff", + "#654dc4ff", + "#6550b9ff", + "#2f265fff", ], light_alpha: [ "#5500aa03", @@ -1282,18 +1282,18 @@ fn violet() -> DefaultColorScaleSet { "#0b0043d9", ], dark: [ - "#14121f00", - "#1b152500", - "#291f4300", - "#33255b00", - "#3c2e6900", - "#47387600", - "#56468b00", - "#6958ad00", - "#6e56cf00", - "#7d66d900", - "#baa7ff00", - "#e2ddfe00", + "#14121fff", + "#1b1525ff", + "#291f43ff", + "#33255bff", + "#3c2e69ff", + "#473876ff", + "#56468bff", + "#6958adff", + "#6e56cfff", + "#7d66d9ff", + "#baa7ffff", + "#e2ddfeff", ], dark_alpha: [ "#4422ff0f", @@ -1306,7 +1306,7 @@ fn violet() -> DefaultColorScaleSet { "#977dfea8", "#8668ffcc", "#9176fed7", - "#baa7ff00", + "#baa7ffff", "#e3defffe", ], } @@ -1316,18 +1316,18 @@ fn iris() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Iris, light: [ - "#fdfdff00", - "#f8f8ff00", - "#f0f1fe00", - "#e6e7ff00", - "#dadcff00", - "#cbcdff00", - "#b8baf800", - "#9b9ef000", - "#5b5bd600", - "#5151cd00", - "#5753c600", - "#27296200", + "#fdfdffff", + "#f8f8ffff", + "#f0f1feff", + "#e6e7ffff", + "#dadcffff", + "#cbcdffff", + "#b8baf8ff", + "#9b9ef0ff", + "#5b5bd6ff", + "#5151cdff", + "#5753c6ff", + "#272962ff", ], light_alpha: [ "#0000ff02", @@ -1344,18 +1344,18 @@ fn iris() -> DefaultColorScaleSet { "#000246d8", ], dark: [ - "#13131e00", - "#17162500", - "#20224800", - "#262a6500", - "#30337400", - "#3d3e8200", - "#4a4a9500", - "#5958b100", - "#5b5bd600", - "#6e6ade00", - "#b1a9ff00", - "#e0dffe00", + "#13131eff", + "#171625ff", + "#202248ff", + "#262a65ff", + "#303374ff", + "#3d3e82ff", + "#4a4a95ff", + "#5958b1ff", + "#5b5bd6ff", + "#6e6adeff", + "#b1a9ffff", + "#e0dffeff", ], dark_alpha: [ "#3636fe0e", @@ -1368,7 +1368,7 @@ fn iris() -> DefaultColorScaleSet { "#7b7afeac", "#6a6afed4", "#7d79ffdc", - "#b1a9ff00", + "#b1a9ffff", "#e1e0fffe", ], } @@ -1378,18 +1378,18 @@ fn indigo() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Indigo, light: [ - "#fdfdfe00", - "#f7f9ff00", - "#edf2fe00", - "#e1e9ff00", - "#d2deff00", - "#c1d0ff00", - "#abbdf900", - "#8da4ef00", - "#3e63dd00", - "#3358d400", - "#3a5bc700", - "#1f2d5c00", + "#fdfdfeff", + "#f7f9ffff", + "#edf2feff", + "#e1e9ffff", + "#d2deffff", + "#c1d0ffff", + "#abbdf9ff", + "#8da4efff", + "#3e63ddff", + "#3358d4ff", + "#3a5bc7ff", + "#1f2d5cff", ], light_alpha: [ "#00008002", @@ -1406,18 +1406,18 @@ fn indigo() -> DefaultColorScaleSet { "#001046e0", ], dark: [ - "#11131f00", - "#14172600", - "#18244900", - "#1d2e6200", - "#25397400", - "#30438400", - "#3a4f9700", - "#435db100", - "#3e63dd00", - "#5472e400", - "#9eb1ff00", - "#d6e1ff00", + "#11131fff", + "#141726ff", + "#182449ff", + "#1d2e62ff", + "#253974ff", + "#304384ff", + "#3a4f97ff", + "#435db1ff", + "#3e63ddff", + "#5472e4ff", + "#9eb1ffff", + "#d6e1ffff", ], dark_alpha: [ "#1133ff0f", @@ -1430,8 +1430,8 @@ fn indigo() -> DefaultColorScaleSet { "#5b81feac", "#4671ffdb", "#5c7efee3", - "#9eb1ff00", - "#d6e1ff00", + "#9eb1ffff", + "#d6e1ffff", ], } } @@ -1440,18 +1440,18 @@ fn blue() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Blue, light: [ - "#fbfdff00", - "#f4faff00", - "#e6f4fe00", - "#d5efff00", - "#c2e5ff00", - "#acd8fc00", - "#8ec8f600", - "#5eb1ef00", - "#0090ff00", - "#0588f000", - "#0d74ce00", - "#11326400", + "#fbfdffff", + "#f4faffff", + "#e6f4feff", + "#d5efffff", + "#c2e5ffff", + "#acd8fcff", + "#8ec8f6ff", + "#5eb1efff", + "#0090ffff", + "#0588f0ff", + "#0d74ceff", + "#113264ff", ], light_alpha: [ "#0080ff04", @@ -1462,24 +1462,24 @@ fn blue() -> DefaultColorScaleSet { "#0088f653", "#0083eb71", "#0084e6a1", - "#0090ff00", + "#0090ffff", "#0086f0fa", "#006dcbf2", "#002359ee", ], dark: [ - "#0d152000", - "#11192700", - "#0d284700", - "#00336200", - "#00407400", - "#104d8700", - "#205d9e00", - "#2870bd00", - "#0090ff00", - "#3b9eff00", - "#70b8ff00", - "#c2e6ff00", + "#0d1520ff", + "#111927ff", + "#0d2847ff", + "#003362ff", + "#004074ff", + "#104d87ff", + "#205d9eff", + "#2870bdff", + "#0090ffff", + "#3b9effff", + "#70b8ffff", + "#c2e6ffff", ], dark_alpha: [ "#004df211", @@ -1490,10 +1490,10 @@ fn blue() -> DefaultColorScaleSet { "#0f89fd7f", "#2a91fe98", "#3094feb9", - "#0090ff00", - "#3b9eff00", - "#70b8ff00", - "#c2e6ff00", + "#0090ffff", + "#3b9effff", + "#70b8ffff", + "#c2e6ffff", ], } } @@ -1502,18 +1502,18 @@ fn cyan() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Cyan, light: [ - "#fafdfe00", - "#f2fafb00", - "#def7f900", - "#caf1f600", - "#b5e9f000", - "#9ddde700", - "#7dcedc00", - "#3db9cf00", - "#00a2c700", - "#0797b900", - "#107d9800", - "#0d3c4800", + "#fafdfeff", + "#f2fafbff", + "#def7f9ff", + "#caf1f6ff", + "#b5e9f0ff", + "#9ddde7ff", + "#7dcedcff", + "#3db9cfff", + "#00a2c7ff", + "#0797b9ff", + "#107d98ff", + "#0d3c48ff", ], light_alpha: [ "#0099cc05", @@ -1524,24 +1524,24 @@ fn cyan() -> DefaultColorScaleSet { "#00a7c162", "#009fbb82", "#00a3c0c2", - "#00a2c700", + "#00a2c7ff", "#0094b7f8", "#007491ef", "#00323ef2", ], dark: [ - "#0b161a00", - "#101b2000", - "#082c3600", - "#00384800", - "#00455800", - "#04546800", - "#12677e00", - "#11809c00", - "#00a2c700", - "#23afd000", - "#4ccce600", - "#b6ecf700", + "#0b161aff", + "#101b20ff", + "#082c36ff", + "#003848ff", + "#004558ff", + "#045468ff", + "#12677eff", + "#11809cff", + "#00a2c7ff", + "#23afd0ff", + "#4ccce6ff", + "#b6ecf7ff", ], dark_alpha: [ "#0091f70a", @@ -1564,18 +1564,18 @@ fn teal() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Teal, light: [ - "#fafefd00", - "#f3fbf900", - "#e0f8f300", - "#ccf3ea00", - "#b8eae000", - "#a1ded200", - "#83cdc100", - "#53b9ab00", - "#12a59400", - "#0d9b8a00", - "#00857300", - "#0d3d3800", + "#fafefdff", + "#f3fbf9ff", + "#e0f8f3ff", + "#ccf3eaff", + "#b8eae0ff", + "#a1ded2ff", + "#83cdc1ff", + "#53b9abff", + "#12a594ff", + "#0d9b8aff", + "#008573ff", + "#0d3d38ff", ], light_alpha: [ "#00cc9905", @@ -1588,22 +1588,22 @@ fn teal() -> DefaultColorScaleSet { "#009783ac", "#009e8ced", "#009684f2", - "#00857300", + "#008573ff", "#00332df2", ], dark: [ - "#0d151400", - "#111c1b00", - "#0d2d2a00", - "#023b3700", - "#08484300", - "#14575000", - "#1c696100", - "#207e7300", - "#12a59400", - "#0eb39e00", - "#0bd8b600", - "#adf0dd00", + "#0d1514ff", + "#111c1bff", + "#0d2d2aff", + "#023b37ff", + "#084843ff", + "#145750ff", + "#1c6961ff", + "#207e73ff", + "#12a594ff", + "#0eb39eff", + "#0bd8b6ff", + "#adf0ddff", ], dark_alpha: [ "#00deab05", @@ -1626,18 +1626,18 @@ fn jade() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Jade, light: [ - "#fbfefd00", - "#f4fbf700", - "#e6f7ed00", - "#d6f1e300", - "#c3e9d700", - "#acdec800", - "#8bceb600", - "#56ba9f00", - "#29a38300", - "#26997b00", - "#20836800", - "#1d3b3100", + "#fbfefdff", + "#f4fbf7ff", + "#e6f7edff", + "#d6f1e3ff", + "#c3e9d7ff", + "#acdec8ff", + "#8bceb6ff", + "#56ba9fff", + "#29a383ff", + "#26997bff", + "#208368ff", + "#1d3b31ff", ], light_alpha: [ "#00c08004", @@ -1654,18 +1654,18 @@ fn jade() -> DefaultColorScaleSet { "#002217e2", ], dark: [ - "#0d151200", - "#121c1800", - "#0f2e2200", - "#0b3b2c00", - "#11483700", - "#1b574500", - "#24685400", - "#2a7e6800", - "#29a38300", - "#27b08b00", - "#1fd8a400", - "#adf0d400", + "#0d1512ff", + "#121c18ff", + "#0f2e22ff", + "#0b3b2cff", + "#114837ff", + "#1b5745ff", + "#246854ff", + "#2a7e68ff", + "#29a383ff", + "#27b08bff", + "#1fd8a4ff", + "#adf0d4ff", ], dark_alpha: [ "#00de4505", @@ -1688,18 +1688,18 @@ fn green() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Green, light: [ - "#fbfefc00", - "#f4fbf600", - "#e6f6eb00", - "#d6f1df00", - "#c4e8d100", - "#adddc000", - "#8eceaa00", - "#5bb98b00", - "#30a46c00", - "#2b9a6600", - "#21835800", - "#193b2d00", + "#fbfefcff", + "#f4fbf6ff", + "#e6f6ebff", + "#d6f1dfff", + "#c4e8d1ff", + "#adddc0ff", + "#8eceaaff", + "#5bb98bff", + "#30a46cff", + "#2b9a66ff", + "#218358ff", + "#193b2dff", ], light_alpha: [ "#00c04004", @@ -1716,18 +1716,18 @@ fn green() -> DefaultColorScaleSet { "#002616e6", ], dark: [ - "#0e151200", - "#121b1700", - "#132d2100", - "#113b2900", - "#17493300", - "#20573e00", - "#28684a00", - "#2f7c5700", - "#30a46c00", - "#33b07400", - "#3dd68c00", - "#b1f1cb00", + "#0e1512ff", + "#121b17ff", + "#132d21ff", + "#113b29ff", + "#174933ff", + "#20573eff", + "#28684aff", + "#2f7c57ff", + "#30a46cff", + "#33b074ff", + "#3dd68cff", + "#b1f1cbff", ], dark_alpha: [ "#00de4505", @@ -1750,18 +1750,18 @@ fn grass() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Grass, light: [ - "#fbfefb00", - "#f5fbf500", - "#e9f6e900", - "#daf1db00", - "#c9e8ca00", - "#b2ddb500", - "#94ce9a00", - "#65ba7400", - "#46a75800", - "#3e9b4f00", - "#2a7e3b00", - "#203c2500", + "#fbfefbff", + "#f5fbf5ff", + "#e9f6e9ff", + "#daf1dbff", + "#c9e8caff", + "#b2ddb5ff", + "#94ce9aff", + "#65ba74ff", + "#46a758ff", + "#3e9b4fff", + "#2a7e3bff", + "#203c25ff", ], light_alpha: [ "#00c00004", @@ -1778,18 +1778,18 @@ fn grass() -> DefaultColorScaleSet { "#002006df", ], dark: [ - "#0e151100", - "#141a1500", - "#1b2a1e00", - "#1d3a2400", - "#25482d00", - "#2d573600", - "#36674000", - "#3e794900", - "#46a75800", - "#53b36500", - "#71d08300", - "#c2f0c200", + "#0e1511ff", + "#141a15ff", + "#1b2a1eff", + "#1d3a24ff", + "#25482dff", + "#2d5736ff", + "#366740ff", + "#3e7949ff", + "#46a758ff", + "#53b365ff", + "#71d083ff", + "#c2f0c2ff", ], dark_alpha: [ "#00de1205", @@ -1812,18 +1812,18 @@ fn lime() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Lime, light: [ - "#fcfdfa00", - "#f8faf300", - "#eef6d600", - "#e2f0bd00", - "#d3e7a600", - "#c2da9100", - "#abc97800", - "#8db65400", - "#bdee6300", - "#b0e64c00", - "#5c7c2f00", - "#37401c00", + "#fcfdfaff", + "#f8faf3ff", + "#eef6d6ff", + "#e2f0bdff", + "#d3e7a6ff", + "#c2da91ff", + "#abc978ff", + "#8db654ff", + "#bdee63ff", + "#b0e64cff", + "#5c7c2fff", + "#37401cff", ], light_alpha: [ "#66990005", @@ -1840,18 +1840,18 @@ fn lime() -> DefaultColorScaleSet { "#1e2900e3", ], dark: [ - "#11130c00", - "#151a1000", - "#1f291700", - "#29371d00", - "#33442300", - "#3d522a00", - "#49623100", - "#57753800", - "#bdee6300", - "#d4ff7000", - "#bde56c00", - "#e3f7ba00", + "#11130cff", + "#151a10ff", + "#1f2917ff", + "#29371dff", + "#334423ff", + "#3d522aff", + "#496231ff", + "#577538ff", + "#bdee63ff", + "#d4ff70ff", + "#bde56cff", + "#e3f7baff", ], dark_alpha: [ "#11bb0003", @@ -1863,7 +1863,7 @@ fn lime() -> DefaultColorScaleSet { "#b6ff6f57", "#b6fd6d6c", "#caff69ed", - "#d4ff7000", + "#d4ff70ff", "#d1fe77e4", "#e9febff7", ], @@ -1874,18 +1874,18 @@ fn mint() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Mint, light: [ - "#f9fefd00", - "#f2fbf900", - "#ddf9f200", - "#c8f4e900", - "#b3ecde00", - "#9ce0d000", - "#7ecfbd00", - "#4cbba500", - "#86ead400", - "#7de0cb00", - "#02786400", - "#16433c00", + "#f9fefdff", + "#f2fbf9ff", + "#ddf9f2ff", + "#c8f4e9ff", + "#b3ecdeff", + "#9ce0d0ff", + "#7ecfbdff", + "#4cbba5ff", + "#86ead4ff", + "#7de0cbff", + "#027864ff", + "#16433cff", ], light_alpha: [ "#00d5aa06", @@ -1902,18 +1902,18 @@ fn mint() -> DefaultColorScaleSet { "#00312ae9", ], dark: [ - "#0e151500", - "#0f1b1b00", - "#092c2b00", - "#003a3800", - "#00474400", - "#10565000", - "#1e685f00", - "#277f7000", - "#86ead400", - "#a8f5e500", - "#58d5ba00", - "#c4f5e100", + "#0e1515ff", + "#0f1b1bff", + "#092c2bff", + "#003a38ff", + "#004744ff", + "#105650ff", + "#1e685fff", + "#277f70ff", + "#86ead4ff", + "#a8f5e5ff", + "#58d5baff", + "#c4f5e1ff", ], dark_alpha: [ "#00dede05", @@ -1936,18 +1936,18 @@ fn sky() -> DefaultColorScaleSet { DefaultColorScaleSet { scale: ColorScaleName::Sky, light: [ - "#f9feff00", - "#f1fafd00", - "#e1f6fd00", - "#d1f0fa00", - "#bee7f500", - "#a9daed00", - "#8dcae300", - "#60b3d700", - "#7ce2fe00", - "#74daf800", - "#00749e00", - "#1d3e5600", + "#f9feffff", + "#f1fafdff", + "#e1f6fdff", + "#d1f0faff", + "#bee7f5ff", + "#a9daedff", + "#8dcae3ff", + "#60b3d7ff", + "#7ce2feff", + "#74daf8ff", + "#00749eff", + "#1d3e56ff", ], light_alpha: [ "#00d5ff06", @@ -1960,22 +1960,22 @@ fn sky() -> DefaultColorScaleSet { "#0085bf9f", "#00c7fe83", "#00bcf38b", - "#00749e00", + "#00749eff", "#002540e2", ], dark: [ - "#0d141f00", - "#111a2700", - "#11284000", - "#11355500", - "#15446700", - "#1b537b00", - "#1f669200", - "#197cae00", - "#7ce2fe00", - "#a8eeff00", - "#75c7f000", - "#c2f3ff00", + "#0d141fff", + "#111a27ff", + "#112840ff", + "#113555ff", + "#154467ff", + "#1b537bff", + "#1f6692ff", + "#197caeff", + "#7ce2feff", + "#a8eeffff", + "#75c7f0ff", + "#c2f3ffff", ], dark_alpha: [ "#0044ff0f", @@ -1987,9 +1987,9 @@ fn sky() -> DefaultColorScaleSet { "#2badfe8b", "#1db2fea9", "#7ce3fffe", - "#a8eeff00", + "#a8eeffff", "#7cd3ffef", - "#c2f3ff00", + "#c2f3ffff", ], } } From a02d80671596b4cfa8afea1a8e7b5294faf46318 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 30 Oct 2023 17:31:15 -0400 Subject: [PATCH 6/6] Add a story showcasing the color scales --- crates/storybook2/src/stories.rs | 2 ++ crates/storybook2/src/stories/colors.rs | 28 +++++++++++++++++++++++++ crates/storybook2/src/story_selector.rs | 2 ++ crates/theme2/src/default.rs | 5 ++--- crates/theme2/src/scale.rs | 9 ++++---- crates/theme2/src/theme2.rs | 2 ++ 6 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 crates/storybook2/src/stories/colors.rs diff --git a/crates/storybook2/src/stories.rs b/crates/storybook2/src/stories.rs index 2517522bc39f7c1207449272c6a574e983397fe3..3d8a332fb93b16ae8480acd32e97bbd4a0c5ab25 100644 --- a/crates/storybook2/src/stories.rs +++ b/crates/storybook2/src/stories.rs @@ -1,9 +1,11 @@ +mod colors; mod focus; mod kitchen_sink; mod scroll; mod text; mod z_index; +pub use colors::*; pub use focus::*; pub use kitchen_sink::*; pub use scroll::*; diff --git a/crates/storybook2/src/stories/colors.rs b/crates/storybook2/src/stories/colors.rs new file mode 100644 index 0000000000000000000000000000000000000000..a0a06200859dbba43e7f34de33032a3e56d453f1 --- /dev/null +++ b/crates/storybook2/src/stories/colors.rs @@ -0,0 +1,28 @@ +use ui::prelude::*; + +use crate::story::Story; + +#[derive(Component)] +pub struct ColorsStory; + +impl ColorsStory { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + let color_scales = theme2::default_color_scales(); + + Story::container(cx) + .child(Story::title(cx, "Colors")) + .child( + div() + .id("colors") + .flex() + .flex_col() + .overflow_y_scroll() + .text_color(gpui2::white()) + .children(color_scales.into_iter().map(|(name, scale)| { + div().child(name.to_string()).child(div().flex().children( + (1..=12).map(|step| div().flex().size_4().bg(scale.step(cx, step))), + )) + })), + ) + } +} diff --git a/crates/storybook2/src/story_selector.rs b/crates/storybook2/src/story_selector.rs index d6ff77c5c1c4ff183e4921ecc53ac7761e59dadd..737f28bda29f10fe5cf992084f7119888281bbf6 100644 --- a/crates/storybook2/src/story_selector.rs +++ b/crates/storybook2/src/story_selector.rs @@ -14,6 +14,7 @@ use ui::prelude::*; pub enum ElementStory { Avatar, Button, + Colors, Details, Focus, Icon, @@ -29,6 +30,7 @@ impl ElementStory { match self { Self::Avatar => { cx.build_view(|cx| (), |_, _| ui::AvatarStory.render()) }.into_any(), Self::Button => { cx.build_view(|cx| (), |_, _| ui::ButtonStory.render()) }.into_any(), + Self::Colors => { cx.build_view(|cx| (), |_, _| ColorsStory.render()) }.into_any(), Self::Details => { { cx.build_view(|cx| (), |_, _| ui::DetailsStory.render()) }.into_any() } diff --git a/crates/theme2/src/default.rs b/crates/theme2/src/default.rs index e3a0527f110697867f82053c24ae2262f0b566d3..41d408f9802a154dee267900fb162d96e7789311 100644 --- a/crates/theme2/src/default.rs +++ b/crates/theme2/src/default.rs @@ -1,6 +1,5 @@ -use std::collections::HashMap; - use gpui2::Rgba; +use indexmap::IndexMap; use crate::scale::{ColorScaleName, ColorScaleSet, ColorScales}; @@ -35,7 +34,7 @@ impl From for ColorScaleSet { pub fn default_color_scales() -> ColorScales { use ColorScaleName::*; - HashMap::from_iter([ + IndexMap::from_iter([ (Gray, gray().into()), (Mauve, mauve().into()), (Slate, slate().into()), diff --git a/crates/theme2/src/scale.rs b/crates/theme2/src/scale.rs index 3aea4762285e66394c3f1ef455b9661e74a3a689..ba37924375131cec7b0ff59b3e4f7c4256c03e05 100644 --- a/crates/theme2/src/scale.rs +++ b/crates/theme2/src/scale.rs @@ -1,6 +1,5 @@ -use std::collections::HashMap; - use gpui2::{AppContext, Hsla}; +use indexmap::IndexMap; use crate::{theme, Appearance}; @@ -87,7 +86,7 @@ impl std::fmt::Display for ColorScaleName { pub type ColorScale = [Hsla; 12]; -pub type ColorScales = HashMap; +pub type ColorScales = IndexMap; /// A one-based step in a [`ColorScale`]. pub type ColorScaleStep = usize; @@ -146,7 +145,7 @@ impl ColorScaleSet { } } - pub fn step(self, cx: &AppContext, step: ColorScaleStep) -> Hsla { + pub fn step(&self, cx: &AppContext, step: ColorScaleStep) -> Hsla { let appearance = Self::current_appearance(cx); match appearance { @@ -155,7 +154,7 @@ impl ColorScaleSet { } } - pub fn step_alpha(self, cx: &AppContext, step: ColorScaleStep) -> Hsla { + pub fn step_alpha(&self, cx: &AppContext, step: ColorScaleStep) -> Hsla { let appearance = Self::current_appearance(cx); match appearance { Appearance::Light => self.light_alpha(step), diff --git a/crates/theme2/src/theme2.rs b/crates/theme2/src/theme2.rs index 66d70296d25579310ee4576efc8614e72f915b50..9425593070b57f391208fdca2b70dfd111544717 100644 --- a/crates/theme2/src/theme2.rs +++ b/crates/theme2/src/theme2.rs @@ -4,7 +4,9 @@ mod scale; mod settings; mod themes; +pub use default::*; pub use registry::*; +pub use scale::*; pub use settings::*; use gpui2::{AppContext, HighlightStyle, Hsla, SharedString};