From 2569170ce1b6c31f5337a89f6d7a9f4295090624 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 12 Apr 2025 18:05:09 +0800 Subject: [PATCH 1/5] feat: add double type tokens for CornerRadius. --- src/Semi.Avalonia/Tokens/Variables.axaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Semi.Avalonia/Tokens/Variables.axaml b/src/Semi.Avalonia/Tokens/Variables.axaml index 16224db..9fd04e1 100644 --- a/src/Semi.Avalonia/Tokens/Variables.axaml +++ b/src/Semi.Avalonia/Tokens/Variables.axaml @@ -20,6 +20,10 @@ 1 1 3 + 3 + 6 + 12 + 9999 3 6 12 From 804f95e0e5c66c048393b3c124b3c2e83771ef53 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 12 Apr 2025 18:06:42 +0800 Subject: [PATCH 2/5] feat: SemiBlue5 hex. --- src/Semi.Avalonia/Themes/Light/Label.axaml | 6 +++--- src/Semi.Avalonia/Tokens/Palette/Light.axaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Light/Label.axaml b/src/Semi.Avalonia/Themes/Light/Label.axaml index 5826e49..d2d28d4 100644 --- a/src/Semi.Avalonia/Themes/Light/Label.axaml +++ b/src/Semi.Avalonia/Themes/Light/Label.axaml @@ -11,7 +11,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/src/Semi.Avalonia/Tokens/Palette/Light.axaml b/src/Semi.Avalonia/Tokens/Palette/Light.axaml index 2d4bbbd..e560278 100644 --- a/src/Semi.Avalonia/Tokens/Palette/Light.axaml +++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml @@ -57,7 +57,7 @@ #98CDFD #65B2FC #3295FB - #0077FA + #0064FA #0062D6 #004FB3 #003D8F From c9e549c3e88944f32025512c3388e936f06ded45 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 12 Apr 2025 19:00:11 +0800 Subject: [PATCH 3/5] feat: replace Label color resources. --- src/Semi.Avalonia/Themes/Dark/Label.axaml | 184 +++++++++++---------- src/Semi.Avalonia/Themes/Light/Label.axaml | 183 ++++++++++---------- 2 files changed, 188 insertions(+), 179 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/Label.axaml b/src/Semi.Avalonia/Themes/Dark/Label.axaml index 1a9c36f..5e81968 100644 --- a/src/Semi.Avalonia/Themes/Dark/Label.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Label.axaml @@ -1,96 +1,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Label.axaml b/src/Semi.Avalonia/Themes/Light/Label.axaml index d2d28d4..5e81968 100644 --- a/src/Semi.Avalonia/Themes/Light/Label.axaml +++ b/src/Semi.Avalonia/Themes/Light/Label.axaml @@ -1,95 +1,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5843cbf430356341c813abbfed13bdcb713aa931 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 12 Apr 2025 19:07:49 +0800 Subject: [PATCH 4/5] feat: remove White color resource in Light & Ghost classes. --- src/Semi.Avalonia/Controls/Label.axaml | 21 ++++++--------------- src/Semi.Avalonia/Themes/Dark/Label.axaml | 18 ++++++++---------- src/Semi.Avalonia/Themes/Light/Label.axaml | 18 ++++++++---------- 3 files changed, 22 insertions(+), 35 deletions(-) diff --git a/src/Semi.Avalonia/Controls/Label.axaml b/src/Semi.Avalonia/Controls/Label.axaml index 3e64583..b6e1ace 100644 --- a/src/Semi.Avalonia/Controls/Label.axaml +++ b/src/Semi.Avalonia/Controls/Label.axaml @@ -266,11 +266,6 @@ - - - + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Label.axaml b/src/Semi.Avalonia/Themes/Dark/Label.axaml index 5e81968..4efeb35 100644 --- a/src/Semi.Avalonia/Themes/Dark/Label.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Label.axaml @@ -33,11 +33,6 @@ - - - - - @@ -71,11 +66,6 @@ - - - - - @@ -97,4 +87,12 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Label.axaml b/src/Semi.Avalonia/Themes/Light/Label.axaml index 5e81968..4efeb35 100644 --- a/src/Semi.Avalonia/Themes/Light/Label.axaml +++ b/src/Semi.Avalonia/Themes/Light/Label.axaml @@ -33,11 +33,6 @@ - - - - - @@ -71,11 +66,6 @@ - - - - - @@ -97,4 +87,12 @@ + + + + + + + + \ No newline at end of file From 47d7e1d7a8d3d9077aef758b986b845697f7b7cb Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 12 Apr 2025 21:55:12 +0800 Subject: [PATCH 5/5] fix: SemiBlue5 hex in Palette. --- src/Semi.Avalonia.ColorPicker/Dark.axaml | 6 +++++- src/Semi.Avalonia.ColorPicker/Light.axaml | 6 +++++- src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs | 2 +- src/Semi.Avalonia.ColorPicker/Shared.axaml | 5 +---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Semi.Avalonia.ColorPicker/Dark.axaml b/src/Semi.Avalonia.ColorPicker/Dark.axaml index 4c9530a..6ef493f 100644 --- a/src/Semi.Avalonia.ColorPicker/Dark.axaml +++ b/src/Semi.Avalonia.ColorPicker/Dark.axaml @@ -1,4 +1,7 @@ - + @@ -14,4 +17,5 @@ 0 0 2 1 #FFFFFF + \ No newline at end of file diff --git a/src/Semi.Avalonia.ColorPicker/Light.axaml b/src/Semi.Avalonia.ColorPicker/Light.axaml index 4c9530a..70af2cb 100644 --- a/src/Semi.Avalonia.ColorPicker/Light.axaml +++ b/src/Semi.Avalonia.ColorPicker/Light.axaml @@ -1,4 +1,7 @@ - + @@ -14,4 +17,5 @@ 0 0 2 1 #FFFFFF + \ No newline at end of file diff --git a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs index fc9f842..8a68445 100644 --- a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs +++ b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs @@ -80,7 +80,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF98CDFD), Color.FromUInt32(0xFF65B2FC), Color.FromUInt32(0xFF3295FB), - Color.FromUInt32(0xFF0077FA), + Color.FromUInt32(0xFF0064FA), Color.FromUInt32(0xFF0062D6), Color.FromUInt32(0xFF004FB3), Color.FromUInt32(0xFF003D8F), diff --git a/src/Semi.Avalonia.ColorPicker/Shared.axaml b/src/Semi.Avalonia.ColorPicker/Shared.axaml index 68bff6b..978f296 100644 --- a/src/Semi.Avalonia.ColorPicker/Shared.axaml +++ b/src/Semi.Avalonia.ColorPicker/Shared.axaml @@ -1,7 +1,6 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> 16 4 70 @@ -20,8 +19,6 @@ 48 - -