feat: unify theme system #7

Merged
reya merged 14 commits from unify-theme into master 2026-11-16 12:58:35 +00:00
3 changed files with 28 additions and 28 deletions
Showing only changes of commit 21faea00c5 - Show all commits
+1 -1
View File
@@ -44,5 +44,5 @@ fn buttons_render_at_their_token_heights(cx: &mut TestAppContext) {
.expect("xsmall button laid out");
assert_eq!(medium.size.height, px(32.0));
assert_eq!(xsmall.size.height, px(24.0));
assert_eq!(xsmall.size.height, px(20.0));
}
+15 -15
View File
@@ -525,22 +525,22 @@ impl SizeTable {
}
let xsmall = ClassFactors {
control_height: 1.5,
input_height: 1.5,
padding_x: 0.375,
text_size: 0.75,
icon_size: 0.75,
dense_icon_size: 0.625,
indicator_size: 0.75,
avatar_size: 1.25,
control_height: 1.25,
input_height: 1.25,
padding_x: 0.25,
text_size: 0.6875,
icon_size: 0.625,
dense_icon_size: 0.5,
indicator_size: 0.625,
avatar_size: 1.125,
caption_size: 0.625,
dense_padding_x: 0.375,
plate_inset: 0.0625,
strip_height: 1.5,
menu_item_height: 1.5,
switch_height: 1.0,
switch_width: 1.75,
switch_knob: 0.625,
dense_padding_x: 0.25,
plate_inset: 0.0,
strip_height: 1.25,
menu_item_height: 1.25,
switch_height: 0.875,
switch_width: 1.5,
switch_knob: 0.5,
};
let small = ClassFactors {
+12 -12
View File
@@ -293,19 +293,19 @@ mod tests {
assert_eq!(resolved.sizes.medium.control_height, px(32.));
assert_eq!(resolved.sizes.medium.input_height, px(32.));
assert_eq!(resolved.sizes.medium.text_size, px(14.));
assert_eq!(resolved.sizes.xsmall.control_height, px(24.));
assert_eq!(resolved.sizes.xsmall.input_height, px(24.));
assert_eq!(resolved.sizes.xsmall.text_size, px(12.));
assert_eq!(resolved.sizes.xsmall.icon_size, px(12.));
assert_eq!(resolved.sizes.xsmall.indicator_size, px(12.));
assert_eq!(resolved.sizes.xsmall.avatar_size, px(20.));
assert_eq!(resolved.sizes.xsmall.control_height, px(20.));
assert_eq!(resolved.sizes.xsmall.input_height, px(20.));
assert_eq!(resolved.sizes.xsmall.text_size, px(11.));
assert_eq!(resolved.sizes.xsmall.icon_size, px(10.));
assert_eq!(resolved.sizes.xsmall.indicator_size, px(10.));
assert_eq!(resolved.sizes.xsmall.avatar_size, px(18.));
assert_eq!(resolved.sizes.xsmall.caption_size, px(10.));
assert_eq!(resolved.sizes.xsmall.dense_padding_x, px(6.));
assert_eq!(resolved.sizes.xsmall.plate_inset, px(1.));
assert_eq!(resolved.sizes.xsmall.menu_item_height, px(24.));
assert_eq!(resolved.sizes.xsmall.switch_height, px(16.));
assert_eq!(resolved.sizes.xsmall.switch_width, px(28.));
assert_eq!(resolved.sizes.xsmall.switch_knob, px(10.));
assert_eq!(resolved.sizes.xsmall.dense_padding_x, px(4.));
assert_eq!(resolved.sizes.xsmall.plate_inset, px(0.));
assert_eq!(resolved.sizes.xsmall.menu_item_height, px(20.));
assert_eq!(resolved.sizes.xsmall.switch_height, px(14.));
assert_eq!(resolved.sizes.xsmall.switch_width, px(24.));
assert_eq!(resolved.sizes.xsmall.switch_knob, px(8.));
assert_eq!(resolved.sizes.small.control_height, px(28.));
assert_eq!(resolved.sizes.small.text_size, px(12.));
assert_eq!(resolved.sizes.small.avatar_size, px(24.));