fix(palette): remove deprecated colors
This commit is contained in:
Vukašin Vojinović
Ashley Wulber
parent
33c60ed87a
commit
478f3ead75
5 changed files with 38 additions and 50 deletions
|
|
@ -88,23 +88,19 @@ pub struct CosmicPaletteInner {
|
|||
/// name of the palette
|
||||
pub name: String,
|
||||
|
||||
/// basic palette
|
||||
/// blue: colors used for various points of emphasis in the UI
|
||||
pub blue: Srgba,
|
||||
/// red: colors used for various points of emphasis in the UI
|
||||
pub red: Srgba,
|
||||
/// green: colors used for various points of emphasis in the UI
|
||||
pub green: Srgba,
|
||||
/// yellow: colors used for various points of emphasis in the UI
|
||||
pub yellow: Srgba,
|
||||
/// Utility Colors
|
||||
/// Colors used for various points of emphasis in the UI.
|
||||
pub bright_red: Srgba,
|
||||
/// Colors used for various points of emphasis in the UI.
|
||||
pub bright_green: Srgba,
|
||||
/// Colors used for various points of emphasis in the UI.
|
||||
pub bright_orange: Srgba,
|
||||
|
||||
/// surface grays
|
||||
/// colors used for three levels of surfaces in the UI
|
||||
/// Surface Grays
|
||||
/// Colors used for three levels of surfaces in the UI.
|
||||
pub gray_1: Srgba,
|
||||
/// colors used for three levels of surfaces in the UI
|
||||
/// Colors used for three levels of surfaces in the UI.
|
||||
pub gray_2: Srgba,
|
||||
/// colors used for three levels of surfaces in the UI
|
||||
pub gray_3: Srgba,
|
||||
|
||||
/// System Neutrals
|
||||
/// A wider spread of dark colors for more general use.
|
||||
|
|
@ -130,13 +126,24 @@ pub struct CosmicPaletteInner {
|
|||
/// A wider spread of dark colors for more general use.
|
||||
pub neutral_10: Srgba,
|
||||
|
||||
// Utility Colors
|
||||
/// Utility bright green
|
||||
pub bright_green: Srgba,
|
||||
/// Utility bright red
|
||||
pub bright_red: Srgba,
|
||||
/// Utility bright orange
|
||||
pub bright_orange: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_blue: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_indigo: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_purple: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_pink: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_red: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_orange: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_yellow: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_green: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_warm_grey: Srgba,
|
||||
|
||||
/// Extended Color Palette
|
||||
/// Colors used for themes, app icons, illustrations, and other brand purposes.
|
||||
|
|
@ -153,25 +160,6 @@ pub struct CosmicPaletteInner {
|
|||
pub ext_pink: Srgba,
|
||||
/// Colors used for themes, app icons, illustrations, and other brand purposes.
|
||||
pub ext_indigo: Srgba,
|
||||
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_blue: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_red: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_green: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_warm_grey: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_orange: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_yellow: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_purple: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_pink: Srgba,
|
||||
/// Potential Accent Color Combos
|
||||
pub accent_indigo: Srgba,
|
||||
}
|
||||
|
||||
impl CosmicPalette {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Dark((name:"cosmic-dark",blue:(red:0.3882353,green:0.81568627,blue:0.87450981,alpha:1.0),red:(red:0.99215686,green:0.63137255,blue:0.62745098,alpha:1.0),green:(red:0.57254902,green:0.81176471,blue:0.61176471,alpha:1.0),yellow:(red:0.96862745,green:0.87843137,blue:0.38431373,alpha:1.0),gray_1:(red:0.10588235,green:0.10588235,blue:0.10588235,alpha:1.0),gray_2:(red:0.14901961,green:0.14901961,blue:0.14901961,alpha:1.0),gray_3:(red:0.2,green:0.2,blue:0.2,alpha:1.0),neutral_0:(red:0.0,green:0.0,blue:0.0,alpha:1.0),neutral_1:(red:0.01176471,green:0.01176471,blue:0.01176471,alpha:1.0),neutral_2:(red:0.08627451,green:0.08627451,blue:0.08627451,alpha:1.0),neutral_3:(red:0.18039216,green:0.18039216,blue:0.18039216,alpha:1.0),neutral_4:(red:0.28235294,green:0.28235294,blue:0.28235294,alpha:1.0),neutral_5:(red:0.38823529,green:0.38823529,blue:0.38823529,alpha:1.0),neutral_6:(red:0.50196078,green:0.50196078,blue:0.50196078,alpha:1.0),neutral_7:(red:0.61960784,green:0.61960784,blue:0.61960784,alpha:1.0),neutral_8:(red:0.74509804,green:0.74509804,blue:0.74509804,alpha:1.0),neutral_9:(red:0.87058824,green:0.87058824,blue:0.87058824,alpha:1.0),neutral_10:(red:1.0,green:1.0,blue:1.0,alpha:1.0),bright_green:(red:0.36862745,green:0.85882353,blue:0.54901961,alpha:1.0),bright_red:(red:1.0,green:0.62745098,blue:0.60392157,alpha:1.0),bright_orange:(red:1.0,green:0.63921569,blue:0.49019608,alpha:1.0),ext_warm_grey:(red:0.60784314,green:0.55686275,blue:0.54117647,alpha:1.0),ext_orange:(red:1.0,green:0.67843137,blue:0.0,alpha:1.0),ext_yellow:(red:0.99607843,green:0.85882353,blue:0.25098039,alpha:1.0),ext_blue:(red:0.28235294,green:0.72549020,blue:0.78039216,alpha:1.0),ext_purple:(red:0.81176471,green:0.49019608,blue:1.0,alpha:1.0),ext_pink:(red:0.97647059,green:0.22745098,blue:0.51372549,alpha:1.0),ext_indigo:(red:0.24313725,green:0.53333333,blue:1.0,alpha:1.0),accent_blue:(red:0.3882353,green:0.81568627,blue:0.87450981,alpha:1.0),accent_red:(red:0.99215686,green:0.63137255,blue:0.62745098,alpha:1.0),accent_green:(red:0.57254902,green:0.81176471,blue:0.61176471,alpha:1.0),accent_warm_grey:(red:0.79215686,green:0.72941176,blue:0.70588235,alpha:1.0),accent_orange:(red:1.0,green:0.67843137,blue:0.0,alpha:1.0),accent_yellow:(red:0.96862745,green:0.87843137,blue:0.38431373,alpha:1.0),accent_purple:(red:0.90588235,green:0.61176471,blue:0.99607843,alpha:1.0),accent_pink:(red:1.0,green:0.61176471,blue:0.69411765,alpha:1.0),accent_indigo:(red:0.63137255,green:0.75294118,blue:0.92156863,alpha:1.0)))
|
||||
Dark((name:"cosmic-dark",bright_red:(red:1.0,green:0.62745098,blue:0.60392157,alpha:1.0),bright_green:(red:0.36862745,green:0.85882352,blue:0.54901960,alpha:1.0),bright_orange:(red:1.0,green:0.63921569,blue:0.49019608,alpha:1.0),gray_1:(red:0.10588235,green:0.10588235,blue:0.10588235,alpha:1.0),gray_2:(red:0.14901961,green:0.14901961,blue:0.14901961,alpha:1.0),neutral_0:(red:0.0,green:0.0,blue:0.0,alpha:1.0),neutral_1:(red:0.01176471,green:0.01176471,blue:0.01176471,alpha:1.0),neutral_2:(red:0.08627451,green:0.08627451,blue:0.08627451,alpha:1.0),neutral_3:(red:0.18039216,green:0.18039216,blue:0.18039216,alpha:1.0),neutral_4:(red:0.28235294,green:0.28235294,blue:0.28235294,alpha:1.0),neutral_5:(red:0.38823529,green:0.38823529,blue:0.38823529,alpha:1.0),neutral_6:(red:0.50196078,green:0.50196078,blue:0.50196078,alpha:1.0),neutral_7:(red:0.61960784,green:0.61960784,blue:0.61960784,alpha:1.0),neutral_8:(red:0.74509804,green:0.74509804,blue:0.74509804,alpha:1.0),neutral_9:(red:0.87058824,green:0.87058824,blue:0.87058824,alpha:1.0),neutral_10:(red:1.0,green:1.0,blue:1.0,alpha:1.0),accent_blue:(red:0.3882353,green:0.81568627,blue:0.87450981,alpha:1.0),accent_indigo:(red:0.63137255,green:0.75294118,blue:0.92156863,alpha:1.0),accent_purple:(red:0.90588235,green:0.61176471,blue:0.99607843,alpha:1.0),accent_pink:(red:1.0,green:0.61176471,blue:0.69411765,alpha:1.0),accent_red:(red:0.99215686,green:0.63137255,blue:0.62745098,alpha:1.0),accent_orange:(red:1.0,green:0.67843137,blue:0.0,alpha:1.0),accent_yellow:(red:0.96862745,green:0.87843137,blue:0.38431373,alpha:1.0),accent_green:(red:0.57254902,green:0.81176471,blue:0.61176471,alpha:1.0),accent_warm_grey:(red:0.79215686,green:0.72941176,blue:0.70588235,alpha:1.0),ext_warm_grey:(red:0.60784314,green:0.55686275,blue:0.54117647,alpha:1.0),ext_orange:(red:1.0,green:0.67843137,blue:0.0,alpha:1.0),ext_yellow:(red:0.99607843,green:0.85882353,blue:0.25098039,alpha:1.0),ext_blue:(red:0.28235294,green:0.72549020,blue:0.78039216,alpha:1.0),ext_purple:(red:0.81176471,green:0.49019608,blue:1.0,alpha:1.0),ext_pink:(red:0.97647059,green:0.22745098,blue:0.51372549,alpha:1.0),ext_indigo:(red:0.24313725,green:0.53333333,blue:1.0,alpha:1.0)))
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Light((name:"cosmic-light",blue:(red:0.0,green:0.32156863,blue:0.35294118,alpha:1.0),red:(red:0.47058824,green:0.16078431,blue:0.18039216,alpha:1.0),green:(red:0.09411765,green:0.33333333,blue:0.16078431,alpha:1.0),yellow:(red:0.32549020,green:0.28235294,blue:0.0,alpha:1.0),gray_1:(red:0.84313725,green:0.84313725,blue:0.84313725,alpha:1.0),gray_2:(red:0.89411765,green:0.89411765,blue:0.89411765,alpha:1.0),gray_3:(red:0.96078431,green:0.96078431,blue:0.96078431,alpha:1.0),neutral_0:(red:1.0,green:1.0,blue:1.0,alpha:1.0),neutral_1:(red:0.87058824,green:0.87058824,blue:0.87058824,alpha:1.0),neutral_2:(red:0.74509804,green:0.74509804,blue:0.74509804,alpha:1.0),neutral_3:(red:0.61960784,green:0.61960784,blue:0.61960784,alpha:1.0),neutral_4:(red:0.50196078,green:0.50196078,blue:0.50196078,alpha:1.0),neutral_5:(red:0.38823529,green:0.38823529,blue:0.38823529,alpha:1.0),neutral_6:(red:0.28235294,green:0.28235294,blue:0.28235294,alpha:1.0),neutral_7:(red:0.18039216,green:0.18039216,blue:0.18039216,alpha:1.0),neutral_8:(red:0.08627451,green:0.08627451,blue:0.08627451,alpha:1.0),neutral_9:(red:0.01176471,green:0.01176471,blue:0.01176471,alpha:1.0),neutral_10:(red:0.0,green:0.0,blue:0.0,alpha:1.0),bright_green:(red:0.0,green:0.34117647,blue:0.17254902,alpha:1.0),bright_red:(red:0.53725490,green:0.01568627,blue:0.09411765,alpha:1.0),bright_orange:(red:0.47450980,green:0.17254902,blue:0.0,alpha:1.0),ext_warm_grey:(red:0.60784314,green:0.55686275,blue:0.54117647,alpha:1.0),ext_orange:(red:0.98431373,green:0.72156863,blue:0.42352941,alpha:1.0),ext_yellow:(red:0.96862745,green:0.87843137,blue:0.38431373,alpha:1.0),ext_blue:(red:0.41568627,green:0.79215686,blue:0.84705882,alpha:1.0),ext_purple:(red:0.83529412,green:0.54901961,blue:1.0,alpha:1.0),ext_pink:(red:1.0,green:0.61176471,blue:0.86666667,alpha:1.0),ext_indigo:(red:0.58431373,green:0.76862745,blue:0.98823529,alpha:1.0),accent_blue:(red:0.0,green:0.32156863,blue:0.35294118,alpha:1.0),accent_red:(red:0.47058824,green:0.16078431,blue:0.18039216,alpha:1.0),accent_green:(red:0.09411765,green:0.33333333,blue:0.16078431,alpha:1.0),accent_warm_grey:(red:0.33333333,green:0.27843137,blue:0.25882353,alpha:1.0),accent_orange:(red:0.38431373,green:0.25098039,blue:0.0,alpha:1.0),accent_yellow:(red:0.32549020,green:0.28235294,blue:0.0,alpha:1.0),accent_purple:(red:0.40784314,green:0.12941176,blue:0.48627451,alpha:1.0),accent_pink:(red:0.52549020,green:0.01568627,blue:0.22745098,alpha:1.0),accent_indigo:(red:0.18039216,green:0.28627451,blue:0.42745098,alpha:1.0)))
|
||||
Light((name:"cosmic-light",bright_red:(red:0.53725490,green:0.01568627,blue:0.09411765,alpha:1.0),bright_green:(red:0.0,green:0.34117647,blue:0.17254901,alpha:1.0),bright_orange:(red:0.47450980,green:0.17254902,blue:0.0,alpha:1.0),gray_1:(red:0.84313725,green:0.84313725,blue:0.84313725,alpha:1.0),gray_2:(red:0.89411765,green:0.89411765,blue:0.89411765,alpha:1.0),neutral_0:(red:1.0,green:1.0,blue:1.0,alpha:1.0),neutral_1:(red:0.87058824,green:0.87058824,blue:0.87058824,alpha:1.0),neutral_2:(red:0.74509804,green:0.74509804,blue:0.74509804,alpha:1.0),neutral_3:(red:0.61960784,green:0.61960784,blue:0.61960784,alpha:1.0),neutral_4:(red:0.50196078,green:0.50196078,blue:0.50196078,alpha:1.0),neutral_5:(red:0.38823529,green:0.38823529,blue:0.38823529,alpha:1.0),neutral_6:(red:0.28235294,green:0.28235294,blue:0.28235294,alpha:1.0),neutral_7:(red:0.18039216,green:0.18039216,blue:0.18039216,alpha:1.0),neutral_8:(red:0.08627451,green:0.08627451,blue:0.08627451,alpha:1.0),neutral_9:(red:0.01176471,green:0.01176471,blue:0.01176471,alpha:1.0),neutral_10:(red:0.0,green:0.0,blue:0.0,alpha:1.0),accent_blue:(red:0.0,green:0.32156863,blue:0.35294118,alpha:1.0),accent_indigo:(red:0.18039216,green:0.28627451,blue:0.42745098,alpha:1.0),accent_purple:(red:0.40784314,green:0.12941176,blue:0.48627451,alpha:1.0),accent_pink:(red:0.52549020,green:0.01568627,blue:0.22745098,alpha:1.0),accent_red:(red:0.47058824,green:0.16078431,blue:0.18039216,alpha:1.0),accent_orange:(red:0.38431373,green:0.25098039,blue:0.0,alpha:1.0),accent_yellow:(red:0.32549020,green:0.28235294,blue:0.0,alpha:1.0),accent_green:(red:0.09411765,green:0.33333333,blue:0.16078431,alpha:1.0),accent_warm_grey:(red:0.33333333,green:0.27843137,blue:0.25882353,alpha:1.0),ext_warm_grey:(red:0.60784314,green:0.55686275,blue:0.54117647,alpha:1.0),ext_orange:(red:0.98431373,green:0.72156863,blue:0.42352941,alpha:1.0),ext_yellow:(red:0.96862745,green:0.87843137,blue:0.38431373,alpha:1.0),ext_blue:(red:0.41568627,green:0.79215686,blue:0.84705882,alpha:1.0),ext_purple:(red:0.83529412,green:0.54901961,blue:1.0,alpha:1.0),ext_pink:(red:1.0,green:0.61176471,blue:0.86666667,alpha:1.0),ext_indigo:(red:0.58431373,green:0.76862745,blue:0.98823529,alpha:1.0)))
|
||||
|
|
|
|||
|
|
@ -758,25 +758,25 @@ impl ThemeBuilder {
|
|||
let accent = if let Some(accent) = accent {
|
||||
accent.into_color()
|
||||
} else {
|
||||
palette.as_ref().blue
|
||||
palette.as_ref().accent_blue
|
||||
};
|
||||
|
||||
let success = if let Some(success) = success {
|
||||
success.into_color()
|
||||
} else {
|
||||
palette.as_ref().green
|
||||
palette.as_ref().accent_green
|
||||
};
|
||||
|
||||
let warning = if let Some(warning) = warning {
|
||||
warning.into_color()
|
||||
} else {
|
||||
palette.as_ref().yellow
|
||||
palette.as_ref().accent_yellow
|
||||
};
|
||||
|
||||
let destructive = if let Some(destructive) = destructive {
|
||||
destructive.into_color()
|
||||
} else {
|
||||
palette.as_ref().red
|
||||
palette.as_ref().accent_red
|
||||
};
|
||||
|
||||
let text_steps_array = text_tint.map(|c| steps(c, NonZeroUsize::new(100).unwrap()));
|
||||
|
|
|
|||
|
|
@ -122,10 +122,10 @@ impl Theme {
|
|||
css.push_str(&component_gtk4_css("accent", accent));
|
||||
css.push_str(&component_gtk4_css("error", destructive));
|
||||
|
||||
css.push_str(&color_css("blue", palette.blue));
|
||||
css.push_str(&color_css("green", palette.green));
|
||||
css.push_str(&color_css("yellow", palette.yellow));
|
||||
css.push_str(&color_css("red", palette.red));
|
||||
css.push_str(&color_css("blue", palette.accent_blue));
|
||||
css.push_str(&color_css("green", palette.accent_green));
|
||||
css.push_str(&color_css("yellow", palette.accent_yellow));
|
||||
css.push_str(&color_css("red", palette.accent_red));
|
||||
css.push_str(&color_css("orange", palette.ext_orange));
|
||||
css.push_str(&color_css("purple", palette.ext_purple));
|
||||
let neutral_steps = steps(palette.neutral_5, NonZeroUsize::new(10).unwrap());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue