修正M3 Scheme的生成算法。

This commit is contained in:
徐涛
2025-02-08 13:49:58 +08:00
parent e2806a0cc5
commit 14d775e956
6 changed files with 141 additions and 141 deletions

View File

@@ -16,7 +16,7 @@ pub struct M3BaselineColors {
pub outline: String,
pub outline_variant: String,
pub scrim: String,
pub shadown: String,
pub shadow: String,
pub customs: HashMap<String, M3ColorSet>,
dark_set: bool,
}
@@ -65,7 +65,7 @@ impl M3BaselineColors {
outline: map_cam16jch_to_srgb_hex(&outline),
outline_variant: map_cam16jch_to_srgb_hex(&outline_variant),
scrim: map_cam16jch_to_srgb_hex(&scrim),
shadown: map_cam16jch_to_srgb_hex(&shadow),
shadow: map_cam16jch_to_srgb_hex(&shadow),
customs: HashMap::new(),
dark_set,
}
@@ -95,7 +95,7 @@ impl M3BaselineColors {
prefix, self.outline_variant
));
css_variables.push(format!("--color-{}-scrim: #{};", prefix, self.scrim));
css_variables.push(format!("--color-{}-shadow: #{};", prefix, self.shadown));
css_variables.push(format!("--color-{}-shadow: #{};", prefix, self.shadow));
for (name, color_set) in &self.customs {
css_variables.extend(color_set.to_css_variables(prefix, name));
}
@@ -118,7 +118,7 @@ impl M3BaselineColors {
prefix, self.outline_variant
));
scss_variables.push(format!("$color-{}-scrim: #{};", prefix, self.scrim));
scss_variables.push(format!("$color-{}-shadow: #{};", prefix, self.shadown));
scss_variables.push(format!("$color-{}-shadow: #{};", prefix, self.shadow));
for (name, color_set) in &self.customs {
scss_variables.extend(color_set.to_scss_variables(prefix, name));
}
@@ -147,7 +147,7 @@ impl M3BaselineColors {
prefix, self.outline_variant
));
js_object_fields.push(format!("{}Scrim: '#{}',", prefix, self.scrim));
js_object_fields.push(format!("{}Shadow: '#{}',", prefix, self.shadown));
js_object_fields.push(format!("{}Shadow: '#{}',", prefix, self.shadow));
for (name, color_set) in &self.customs {
js_object_fields.extend(color_set.to_javascript_object_fields(prefix, name));
}