diff --git a/src/Semi.Avalonia/Index.axaml b/src/Semi.Avalonia/Index.axaml index 013498e..334aa54 100644 --- a/src/Semi.Avalonia/Index.axaml +++ b/src/Semi.Avalonia/Index.axaml @@ -1,4 +1,5 @@ - @@ -12,8 +13,8 @@ - + diff --git a/src/Semi.Avalonia/SemiTheme.axaml b/src/Semi.Avalonia/SemiTheme.axaml index 8d158b8..eea19b2 100644 --- a/src/Semi.Avalonia/SemiTheme.axaml +++ b/src/Semi.Avalonia/SemiTheme.axaml @@ -1,4 +1,6 @@ - @@ -12,8 +14,8 @@ - + diff --git a/src/Semi.Avalonia/Themes/Base.axaml b/src/Semi.Avalonia/Themes/Base.axaml deleted file mode 100644 index 2489219..0000000 --- a/src/Semi.Avalonia/Themes/Base.axaml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - 14 - Inter, -apple-system,BlinkMacSystemFont,PingFang SC, Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,Helvetica,Arial,sans-serif - Cascadia Code, Consolas, Inconsolata, monospace - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Window.axaml b/src/Semi.Avalonia/Themes/Dark/Window.axaml index 1f95612..b9d1483 100644 --- a/src/Semi.Avalonia/Themes/Dark/Window.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Window.axaml @@ -1,4 +1,5 @@ + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Window.axaml b/src/Semi.Avalonia/Themes/Light/Window.axaml index 1f95612..b9d1483 100644 --- a/src/Semi.Avalonia/Themes/Light/Window.axaml +++ b/src/Semi.Avalonia/Themes/Light/Window.axaml @@ -1,4 +1,5 @@ + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml b/src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml index d55d612..23605e3 100644 --- a/src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml +++ b/src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml @@ -1,4 +1,4 @@ 2 - 3 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml index 3e775cf..173bcff 100644 --- a/src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml +++ b/src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml @@ -1,10 +1,10 @@ - 1 - 4 + + 0 4 - 6 - 32 - 24 - 40 + + + + 600 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/Border.axaml b/src/Semi.Avalonia/Themes/Shared/Border.axaml index ba9887f..ea633c4 100644 --- a/src/Semi.Avalonia/Themes/Shared/Border.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Border.axaml @@ -1,6 +1,6 @@ - 4 - 20 - 4 - 1 + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/Button.axaml b/src/Semi.Avalonia/Themes/Shared/Button.axaml index 567a07a..e0bca57 100644 --- a/src/Semi.Avalonia/Themes/Shared/Button.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Button.axaml @@ -1,18 +1,13 @@ - 14 - 600 - + + 12 6 16 10 6 2 - - 32 - 24 - 40 - - 1 - - 3 - + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml index 857b225..2be0bc3 100644 --- a/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml @@ -1,7 +1,6 @@ - - - - 3 - 1 + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/Calendar.axaml b/src/Semi.Avalonia/Themes/Shared/Calendar.axaml index 0a6ec26..47d4f95 100644 --- a/src/Semi.Avalonia/Themes/Shared/Calendar.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Calendar.axaml @@ -1,14 +1,12 @@ - 1 - 6 + + 40 - - - - 600 - 3 - 3 - + + + + + 240 250 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml index c0e4f5b..1e9852b 100644 --- a/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml @@ -1,8 +1,8 @@ - - 1 - 3 - 32 - 24 - 40 + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/Carousel.axaml b/src/Semi.Avalonia/Themes/Shared/Carousel.axaml index ab9344e..dc5bf1e 100644 --- a/src/Semi.Avalonia/Themes/Shared/Carousel.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Carousel.axaml @@ -1,14 +1,10 @@ - - + 8 8 - 4 - 4 12 20 - 20 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml b/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml index c87f768..b690426 100644 --- a/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml @@ -1,20 +1,16 @@ - 14 + 16 16 0 2 0 0 8 0 0 0 - 16 16 - - 3 - 1 - - - - - 1 + + + + + 16 12 - 3 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml index a415b22..1534907 100644 --- a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml @@ -1,21 +1,16 @@ - 3 - 1 - + + 12 8 12 0 0 0 - 504 - 1 - 6 - + + 32 - - - 4 + + 0 4 - - 32 - 24 - 40 + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Shared/DataValidationErrors.axaml index d1981be..9b91be8 100644 --- a/src/Semi.Avalonia/Themes/Shared/DataValidationErrors.axaml +++ b/src/Semi.Avalonia/Themes/Shared/DataValidationErrors.axaml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/DatePicker.axaml b/src/Semi.Avalonia/Themes/Shared/DatePicker.axaml index 3f128e5..50e0964 100644 --- a/src/Semi.Avalonia/Themes/Shared/DatePicker.axaml +++ b/src/Semi.Avalonia/Themes/Shared/DatePicker.axaml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml index 6a67390..48111f0 100644 --- a/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml @@ -3,17 +3,12 @@ - 36 - - - 0 - 8 - - 24 - 32 - 40 - - 1 - 3 + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml b/src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml index 1f84e28..0bfbfbe 100644 --- a/src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml +++ b/src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/Expander.axaml b/src/Semi.Avalonia/Themes/Shared/Expander.axaml index 11008af..42b9cdf 100644 --- a/src/Semi.Avalonia/Themes/Shared/Expander.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Expander.axaml @@ -1,11 +1,10 @@ - 600 - 8 + + 8 0 0 0 - - + 8 4 - 8 + 16 4 16 8 0 0 0 1 0 1 0 0 diff --git a/src/Semi.Avalonia/Themes/Shared/Flyout.axaml b/src/Semi.Avalonia/Themes/Shared/Flyout.axaml index 62aff56..dc0345a 100644 --- a/src/Semi.Avalonia/Themes/Shared/Flyout.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Flyout.axaml @@ -1,10 +1,10 @@ - 400 - 1 + + 100 100 600 600 - 6 - 8 + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Shared/GridSplitter.axaml index d1981be..9b91be8 100644 --- a/src/Semi.Avalonia/Themes/Shared/GridSplitter.axaml +++ b/src/Semi.Avalonia/Themes/Shared/GridSplitter.axaml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml index 24289d5..c74049b 100644 --- a/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml +++ b/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml @@ -1,7 +1,7 @@ - - 6 - 1 - 600 - 20 - 20 + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml index 9e7fbcd..3675662 100644 --- a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml +++ b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml @@ -1,9 +1,8 @@ - 14 - 600 + + 16 16 0 0 4 0 - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/Label.axaml b/src/Semi.Avalonia/Themes/Shared/Label.axaml index ffc7296..414ecc7 100644 --- a/src/Semi.Avalonia/Themes/Shared/Label.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Label.axaml @@ -1,10 +1,10 @@ - 1 + 8 2 8 4 20 24 - 12 - 3 - 9999 + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml index a9cb0b5..53234a0 100644 --- a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml @@ -2,5 +2,4 @@ 12 8 0 - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml index 5e82286..7b0583a 100644 --- a/src/Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/Menu.axaml b/src/Semi.Avalonia/Themes/Shared/Menu.axaml index c2410c2..07044ec 100644 --- a/src/Semi.Avalonia/Themes/Shared/Menu.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Menu.axaml @@ -1,28 +1,22 @@ - - - - - - + + + + - 1 + 0 4 - 6 + 16 100 400 600 - 16 8 - - 3 - + 1 - 2 + 0 0 12 0 4 0 - 4 0 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml index 646795d..7c20b02 100644 --- a/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml +++ b/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml @@ -1,22 +1,19 @@ 320 - 1 - 6 - 8 + + + 20 16 12 16 - - 20 - 20 + + 0 0 12 0 - - - - - - 4 - - 16 - 600 - 14 - 400 + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml b/src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml index d7c57fd..0ca8dc8 100644 --- a/src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml +++ b/src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml @@ -1,6 +1,6 @@ - 3 - 32 - 24 - 40 + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Shared/ProgressBar.axaml index 56142f7..a3a8168 100644 --- a/src/Semi.Avalonia/Themes/Shared/ProgressBar.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ProgressBar.axaml @@ -1,4 +1,4 @@ - 3 - 600 + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml b/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml index e47c9e1..605e14b 100644 --- a/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml @@ -2,29 +2,23 @@ 16 6 - 14 + 0 2 0 0 - - 1 + 8 0 0 0 - - 3 - - 3 - 3 - - 600 + + + + 16 2 16 4 24 6 - - 12 - 12 - 14 - + + + - 1 + 16 12 - 3 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml index d884e37..771973a 100644 --- a/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml @@ -1,5 +1,5 @@ - 14 + 10 diff --git a/src/Semi.Avalonia/Themes/Shared/Slider.axaml b/src/Semi.Avalonia/Themes/Shared/Slider.axaml index 42c66a9..66f92ea 100644 --- a/src/Semi.Avalonia/Themes/Shared/Slider.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Slider.axaml @@ -1,12 +1,11 @@ 4 - 3 + 16 16 24 - 0 - + 4 4 - 2 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/SplitView.axaml b/src/Semi.Avalonia/Themes/Shared/SplitView.axaml index 944eb37..b3780e7 100644 --- a/src/Semi.Avalonia/Themes/Shared/SplitView.axaml +++ b/src/Semi.Avalonia/Themes/Shared/SplitView.axaml @@ -1,10 +1,7 @@ - + 320 48 - 00:00:00.2 - 00:00:00.1 + 00:00:00.2 + 00:00:00.1 0.1,0.9,0.2,1.0 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/TabControl.axaml b/src/Semi.Avalonia/Themes/Shared/TabControl.axaml index d1981be..9b91be8 100644 --- a/src/Semi.Avalonia/Themes/Shared/TabControl.axaml +++ b/src/Semi.Avalonia/Themes/Shared/TabControl.axaml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/TabItem.axaml b/src/Semi.Avalonia/Themes/Shared/TabItem.axaml index 9e9c07e..bd6b384 100644 --- a/src/Semi.Avalonia/Themes/Shared/TabItem.axaml +++ b/src/Semi.Avalonia/Themes/Shared/TabItem.axaml @@ -1,3 +1,3 @@ - 600 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml index 514d9ca..6fdefa0 100644 --- a/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml +++ b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml @@ -1,15 +1,14 @@ - 12 - - 14 - 32 - 28 - 24 - 20 - 18 - 16 - 400 - 600 - + + + + + + + + + + 2 + Cascadia Code, Consolas, Inconsolata, monospace \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/TextBox.axaml b/src/Semi.Avalonia/Themes/Shared/TextBox.axaml index 1746095..88047cc 100644 --- a/src/Semi.Avalonia/Themes/Shared/TextBox.axaml +++ b/src/Semi.Avalonia/Themes/Shared/TextBox.axaml @@ -1,18 +1,14 @@ - 32 - 24 - 40 - - 3 - + + + + 0 0 8 0 8 0 0 0 8 0 - 1 - + 12 5 90 - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml index cfa03fe..d73b148 100644 --- a/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml @@ -1,7 +1,6 @@ - 14 - 600 - - 1 - 3 + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml index 2baad9f..fb0e239 100644 --- a/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml @@ -5,7 +5,7 @@ 40 26 54 - 1 + 12 8 16 @@ -19,12 +19,9 @@ 2 1 3 - - 12 - 14 - + + 8 4 8 4 - - 14 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml b/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml index 137de36..2c602d5 100644 --- a/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml @@ -1,6 +1,6 @@ - 6 + 12 8 320 - 1 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/TreeView.axaml b/src/Semi.Avalonia/Themes/Shared/TreeView.axaml index 100748a..5d42b00 100644 --- a/src/Semi.Avalonia/Themes/Shared/TreeView.axaml +++ b/src/Semi.Avalonia/Themes/Shared/TreeView.axaml @@ -1,9 +1,7 @@ 20 8 - - - + 8 0 0 4 8 4 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/Window.axaml b/src/Semi.Avalonia/Themes/Shared/Window.axaml index d1981be..6c18d0f 100644 --- a/src/Semi.Avalonia/Themes/Shared/Window.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Window.axaml @@ -1,2 +1,4 @@ - + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/_index.axaml b/src/Semi.Avalonia/Themes/Shared/_index.axaml index 20cdaf7..3ff987e 100644 --- a/src/Semi.Avalonia/Themes/Shared/_index.axaml +++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml @@ -1,4 +1,4 @@ - + diff --git a/src/Semi.Avalonia/Tokens/Variables.axaml b/src/Semi.Avalonia/Tokens/Variables.axaml new file mode 100644 index 0000000..f3de46d --- /dev/null +++ b/src/Semi.Avalonia/Tokens/Variables.axaml @@ -0,0 +1,69 @@ + + + 24 + 32 + 40 + 8 + 12 + 16 + 20 + 24 + + + 0 + 1 + 1 + 0 + 1 + 1 + 3 + 3 + 6 + 12 + 999 + + + 0 + 2 + 4 + 8 + 12 + 16 + 20 + 24 + 32 + 40 + + + 0 + 2 + 4 + 8 + 12 + 16 + 20 + 24 + 32 + 40 + + + 12 + 14 + 16 + 18 + 20 + 24 + 28 + 32 + 200 + 400 + 600 + + Inter, -apple-system, BlinkMacSystemFont, PingFang SC, + Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue, + Helvetica, Arial, sans-serif + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Tokens/Variables.axaml.cs b/src/Semi.Avalonia/Tokens/Variables.axaml.cs new file mode 100644 index 0000000..27ac62c --- /dev/null +++ b/src/Semi.Avalonia/Tokens/Variables.axaml.cs @@ -0,0 +1,5 @@ +using Avalonia.Controls; + +namespace Semi.Avalonia.Tokens; + +public class Variables : ResourceDictionary; \ No newline at end of file