From 67cbcfe31353ace03e1f369ba06f8ce1dbc5710c Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 26 Dec 2024 01:25:39 +0800 Subject: [PATCH 01/14] feat: extract themes to Schemes. --- src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml | 6 ++++++ src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml | 6 ++++++ src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml | 6 ++++++ src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml | 6 ++++++ src/Semi.Avalonia/Themes/SemiTheme.axaml | 8 ++++---- .../{Themes => Tokens}/HighContrast/Aquatic.axaml | 3 --- .../{Themes => Tokens}/HighContrast/Desert.axaml | 3 --- .../{Themes => Tokens}/HighContrast/Dusk.axaml | 3 --- .../{Themes => Tokens}/HighContrast/NightSky.axaml | 3 --- 9 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml create mode 100644 src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml create mode 100644 src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml create mode 100644 src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml rename src/Semi.Avalonia/{Themes => Tokens}/HighContrast/Aquatic.axaml (74%) rename src/Semi.Avalonia/{Themes => Tokens}/HighContrast/Desert.axaml (74%) rename src/Semi.Avalonia/{Themes => Tokens}/HighContrast/Dusk.axaml (74%) rename src/Semi.Avalonia/{Themes => Tokens}/HighContrast/NightSky.axaml (74%) diff --git a/src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml new file mode 100644 index 0000000..4181245 --- /dev/null +++ b/src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml new file mode 100644 index 0000000..6fdac84 --- /dev/null +++ b/src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml new file mode 100644 index 0000000..fe3d1b4 --- /dev/null +++ b/src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml new file mode 100644 index 0000000..a337c82 --- /dev/null +++ b/src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/Themes/SemiTheme.axaml index 77181be..978f91f 100644 --- a/src/Semi.Avalonia/Themes/SemiTheme.axaml +++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml @@ -5,10 +5,10 @@ - - - - + + + + diff --git a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml similarity index 74% rename from src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml rename to src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml index 28b911a..a2583be 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml +++ b/src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml @@ -7,7 +7,4 @@ #8EE3F0 #FFFFFF #202020 - - - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml similarity index 74% rename from src/Semi.Avalonia/Themes/HighContrast/Desert.axaml rename to src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml index 60c1a26..80bd582 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml +++ b/src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml @@ -7,7 +7,4 @@ #903909 #202020 #FFFAEF - - - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml similarity index 74% rename from src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml rename to src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml index 6d4f033..6474bdf 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml +++ b/src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml @@ -7,7 +7,4 @@ #A1BFDE #B6F6F0 #2D3236 - - - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml b/src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml similarity index 74% rename from src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml rename to src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml index f62d65c..a2c9c9c 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml +++ b/src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml @@ -7,7 +7,4 @@ #D6B4FD #FFEE32 #000000 - - - \ No newline at end of file From 0eb138d73c98c535ad613973d55d7913f704235d Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 26 Dec 2024 01:42:18 +0800 Subject: [PATCH 02/14] feat: redesign schemes. --- .../ViewModels/PaletteDemoViewModel.cs | 5 +++-- src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs | 9 --------- src/Semi.Avalonia/Themes/Dark/_index.axaml | 2 -- src/Semi.Avalonia/Themes/Light/Palette.axaml.cs | 9 --------- src/Semi.Avalonia/Themes/Light/_index.axaml | 2 -- src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml | 6 ++++++ src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml | 6 ++++++ src/Semi.Avalonia/Themes/SemiTheme.axaml | 4 ++-- src/Semi.Avalonia/Themes/Shared/Palette.axaml | 2 -- src/Semi.Avalonia/Themes/Shared/_index.axaml | 2 -- .../Dark/Palette.axaml => Tokens/Palette/Dark.axaml} | 2 +- src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs | 5 +++++ .../Light/Palette.axaml => Tokens/Palette/Light.axaml} | 2 +- src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs | 5 +++++ 14 files changed, 29 insertions(+), 32 deletions(-) delete mode 100644 src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs delete mode 100644 src/Semi.Avalonia/Themes/Light/Palette.axaml.cs create mode 100644 src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml create mode 100644 src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml delete mode 100644 src/Semi.Avalonia/Themes/Shared/Palette.axaml rename src/Semi.Avalonia/{Themes/Dark/Palette.axaml => Tokens/Palette/Dark.axaml} (99%) create mode 100644 src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs rename src/Semi.Avalonia/{Themes/Light/Palette.axaml => Tokens/Palette/Light.axaml} (99%) create mode 100644 src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs diff --git a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs index cf23454..ac572b4 100644 --- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs +++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs @@ -5,6 +5,7 @@ using Avalonia.Controls; using Avalonia.Media; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Messaging; +using Semi.Avalonia.Tokens.Palette; namespace Semi.Avalonia.Demo.ViewModels; @@ -51,8 +52,8 @@ public class PaletteDemoViewModel : ObservableObject public PaletteDemoViewModel() { - _lightResourceDictionary = new Light.Palette(); - _darkResourceDictionary = new Dark.Palette(); + _lightResourceDictionary = new Light(); + _darkResourceDictionary = new Dark(); WeakReferenceMessenger.Default.Register(this, OnClickColorItem); } diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs b/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs deleted file mode 100644 index 196931f..0000000 --- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml; - -namespace Semi.Avalonia.Dark; - -public class Palette: ResourceDictionary -{ - -} \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/_index.axaml b/src/Semi.Avalonia/Themes/Dark/_index.axaml index 017f040..b2620b9 100644 --- a/src/Semi.Avalonia/Themes/Dark/_index.axaml +++ b/src/Semi.Avalonia/Themes/Dark/_index.axaml @@ -1,7 +1,5 @@ - - diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs b/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs deleted file mode 100644 index e391acb..0000000 --- a/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml; - -namespace Semi.Avalonia.Light; - -public class Palette: ResourceDictionary -{ - -} \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/_index.axaml b/src/Semi.Avalonia/Themes/Light/_index.axaml index c747222..6ce2972 100644 --- a/src/Semi.Avalonia/Themes/Light/_index.axaml +++ b/src/Semi.Avalonia/Themes/Light/_index.axaml @@ -1,7 +1,5 @@ - - diff --git a/src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml new file mode 100644 index 0000000..0666d38 --- /dev/null +++ b/src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml new file mode 100644 index 0000000..28a6714 --- /dev/null +++ b/src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/Themes/SemiTheme.axaml index 978f91f..3412a7f 100644 --- a/src/Semi.Avalonia/Themes/SemiTheme.axaml +++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml @@ -3,8 +3,8 @@ - - + + diff --git a/src/Semi.Avalonia/Themes/Shared/Palette.axaml b/src/Semi.Avalonia/Themes/Shared/Palette.axaml deleted file mode 100644 index d1981be..0000000 --- a/src/Semi.Avalonia/Themes/Shared/Palette.axaml +++ /dev/null @@ -1,2 +0,0 @@ - - \ 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 7d03eff..20cdaf7 100644 --- a/src/Semi.Avalonia/Themes/Shared/_index.axaml +++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml @@ -1,7 +1,5 @@  - - diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml similarity index 99% rename from src/Semi.Avalonia/Themes/Dark/Palette.axaml rename to src/Semi.Avalonia/Tokens/Palette/Dark.axaml index 9d52d2e..a2146f5 100644 --- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml +++ b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml @@ -1,4 +1,4 @@ - + #6C090B #901110 diff --git a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs new file mode 100644 index 0000000..3debf2a --- /dev/null +++ b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs @@ -0,0 +1,5 @@ +using Avalonia.Controls; + +namespace Semi.Avalonia.Tokens.Palette; + +public class Dark : ResourceDictionary; \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Tokens/Palette/Light.axaml similarity index 99% rename from src/Semi.Avalonia/Themes/Light/Palette.axaml rename to src/Semi.Avalonia/Tokens/Palette/Light.axaml index af79721..673e4ce 100644 --- a/src/Semi.Avalonia/Themes/Light/Palette.axaml +++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml @@ -1,4 +1,4 @@ - + #FEF2ED #FEDDD2 diff --git a/src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs b/src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs new file mode 100644 index 0000000..44a15af --- /dev/null +++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs @@ -0,0 +1,5 @@ +using Avalonia.Controls; + +namespace Semi.Avalonia.Tokens.Palette; + +public class Light : ResourceDictionary; \ No newline at end of file From b25181c5bc8e5c0d319ef2a68fd8044b6a073209 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 26 Dec 2024 19:56:46 +0800 Subject: [PATCH 03/14] feat: replace brush with opacity. --- .../Themes/Dark/AdornerLayer.axaml | 2 +- .../Themes/Dark/AutoCompleteBox.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Border.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Button.axaml | 39 +++++------------- .../Themes/Dark/ButtonSpinner.axaml | 8 ++-- src/Semi.Avalonia/Themes/Dark/Calendar.axaml | 32 ++++++--------- .../Themes/Dark/CalendarDatePicker.axaml | 11 +++-- .../Themes/Dark/CaptionButtons.axaml | 6 +-- src/Semi.Avalonia/Themes/Dark/CheckBox.axaml | 23 ++++------- src/Semi.Avalonia/Themes/Dark/ComboBox.axaml | 41 ++++++++----------- .../Themes/Dark/DataValidationErrors.axaml | 14 +++---- .../Themes/Dark/DateTimePickerShared.axaml | 23 ++++------- src/Semi.Avalonia/Themes/Dark/Expander.axaml | 10 ++--- src/Semi.Avalonia/Themes/Dark/Flyout.axaml | 2 +- .../Themes/Dark/HeaderedContentControl.axaml | 2 +- .../Themes/Dark/HyperlinkButton.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/ListBox.axaml | 13 +++--- src/Semi.Avalonia/Themes/Dark/Menu.axaml | 23 ++++------- .../Themes/Dark/NotificationCard.axaml | 15 ++++--- .../Themes/Dark/ProgressBar.axaml | 2 +- .../Themes/Dark/RadioButton.axaml | 38 +++++++---------- .../Themes/Dark/ScrollViewer.axaml | 8 ++-- src/Semi.Avalonia/Themes/Dark/Slider.axaml | 4 +- src/Semi.Avalonia/Themes/Dark/SplitView.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/TabItem.axaml | 9 ++-- src/Semi.Avalonia/Themes/Dark/TextBlock.axaml | 17 ++++---- src/Semi.Avalonia/Themes/Dark/TextBox.axaml | 16 +++----- .../Themes/Dark/ToggleButton.axaml | 41 +++++++------------ .../Themes/Dark/ToggleSwitch.axaml | 13 ++---- src/Semi.Avalonia/Themes/Dark/TreeView.axaml | 13 +++--- 30 files changed, 173 insertions(+), 260 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml b/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml index 53e13c9..e7eae69 100644 --- a/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml +++ b/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml index 032758e..8768dc3 100644 --- a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml @@ -1,5 +1,5 @@ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Border.axaml b/src/Semi.Avalonia/Themes/Dark/Border.axaml index 8593cc1..890f455 100644 --- a/src/Semi.Avalonia/Themes/Dark/Border.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml @@ -1,5 +1,5 @@ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml index 65432c3..354508c 100644 --- a/src/Semi.Avalonia/Themes/Dark/Button.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml @@ -2,95 +2,76 @@ - + - - - - - - + + + + - - - - - - - - - - - - - - - + - - - - + + + - - - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml index 29fa9fd..c31a34d 100644 --- a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml @@ -1,9 +1,9 @@ - + - + - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml index 9b994ad..892dd87 100644 --- a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml @@ -1,35 +1,29 @@ - - - - + + + - - + + - - + + - - - - - + + - - - - - - + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml index 6be4aac..9dcbc2f 100644 --- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml @@ -1,18 +1,17 @@ - + - + - + - + inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml index 8c54002..a3c7a09 100644 --- a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml @@ -1,7 +1,7 @@ - - + + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml index c620699..115a47f 100644 --- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml @@ -1,34 +1,29 @@ - - + - - - + + - + - - - - + + - - + - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml index 08b1b1e..a940542 100644 --- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml @@ -1,45 +1,38 @@ - - - - - - + + + + + + - - + - - - - + + inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - - + - - + - + - + - - - + + - - + - + diff --git a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml index 40df42c..78be013 100644 --- a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml +++ b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml index 2a19de4..559cdc5 100644 --- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml @@ -2,29 +2,22 @@ - + - - - - - - - + + + - + - - + - - + - + - inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Expander.axaml b/src/Semi.Avalonia/Themes/Dark/Expander.axaml index 9e41ae3..88b8c04 100644 --- a/src/Semi.Avalonia/Themes/Dark/Expander.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Expander.axaml @@ -1,9 +1,9 @@ - + - + - - - + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml index 463e7fa..ac41fd7 100644 --- a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml @@ -1,6 +1,6 @@ - + inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml index 56bc792..92076c2 100644 --- a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml +++ b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml index 82f0260..5ab93f1 100644 --- a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml index 1aad3e1..316eab6 100644 --- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml @@ -1,15 +1,14 @@ - - + - + - + - - + + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml index d3a9ef1..e02ed3c 100644 --- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml @@ -1,26 +1,21 @@ - - - + + - + inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - - - + - - - + + - + - - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml index b7d7d0c..b2a2166 100644 --- a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml +++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml @@ -1,5 +1,5 @@ - + @@ -7,15 +7,14 @@ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - - + - + - + - + - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml index 7b74afd..9c6ff25 100644 --- a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml @@ -1,6 +1,6 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml index fe1e7b0..a494094 100644 --- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml @@ -1,18 +1,14 @@ - - + - - - - - + + + + - - - + @@ -22,28 +18,24 @@ - - - - - + + - - - + + + - - + - + - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml index 0442022..277090e 100644 --- a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml @@ -1,7 +1,7 @@ - - - - + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Slider.axaml b/src/Semi.Avalonia/Themes/Dark/Slider.axaml index 4f446cf..7a2d10f 100644 --- a/src/Semi.Avalonia/Themes/Dark/Slider.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Slider.axaml @@ -1,13 +1,11 @@ - - + - diff --git a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml index 0deac77..10f729d 100644 --- a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml +++ b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml index 52dbbd2..f70dc56 100644 --- a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml @@ -2,10 +2,9 @@ - - - - - + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml index ca0e53a..68ca7cc 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml @@ -1,17 +1,16 @@ - - - + + + - - - - - - + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml index 9d1e8d9..0ab6d62 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml @@ -1,24 +1,20 @@ - - - + + - - - - + + + - - + - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml index beb7ffb..2171ee6 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml @@ -1,20 +1,17 @@ - - - + + + - - - + + - - + - @@ -22,14 +19,12 @@ - - @@ -38,51 +33,43 @@ - - - - - - - - - + + + + + + - + - - - - - - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml index e5d733b..1397594 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml @@ -1,20 +1,15 @@ - - - - + + + - - - - + - 0 4 6 0 #1A000000, 0 0 1 0 #4D000000 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml index 4ecbd61..1a63f32 100644 --- a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml @@ -1,15 +1,14 @@ - + - - + - - + + - + - + \ No newline at end of file From 013eb39bac582194efc57d358ba61bfb81ae0f2a Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 26 Dec 2024 22:31:49 +0800 Subject: [PATCH 04/14] feat: specific solid color. --- .../Themes/Dark/AdornerLayer.axaml | 2 +- .../Themes/Dark/AutoCompleteBox.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Border.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Button.axaml | 94 +++++++-------- .../Themes/Dark/ButtonSpinner.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Calendar.axaml | 20 ++-- .../Themes/Dark/CalendarDatePicker.axaml | 8 +- .../Themes/Dark/CaptionButtons.axaml | 4 +- src/Semi.Avalonia/Themes/Dark/CheckBox.axaml | 30 ++--- src/Semi.Avalonia/Themes/Dark/ComboBox.axaml | 28 ++--- .../Themes/Dark/DataValidationErrors.axaml | 4 +- .../Themes/Dark/DateTimePickerShared.axaml | 8 +- src/Semi.Avalonia/Themes/Dark/Expander.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Flyout.axaml | 4 +- .../Themes/Dark/HeaderedContentControl.axaml | 4 +- .../Themes/Dark/HyperlinkButton.axaml | 6 +- src/Semi.Avalonia/Themes/Dark/ListBox.axaml | 6 +- .../Themes/Dark/ManagedFileChooser.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Menu.axaml | 8 +- .../Themes/Dark/NotificationCard.axaml | 22 ++-- .../Themes/Dark/ProgressBar.axaml | 20 ++-- .../Themes/Dark/RadioButton.axaml | 32 +++--- .../Themes/Dark/RefreshContainer.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Slider.axaml | 8 +- src/Semi.Avalonia/Themes/Dark/SplitView.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/TabItem.axaml | 4 +- src/Semi.Avalonia/Themes/Dark/TextBlock.axaml | 8 +- src/Semi.Avalonia/Themes/Dark/TextBox.axaml | 6 +- .../Themes/Dark/ToggleButton.axaml | 108 +++++++++--------- .../Themes/Dark/ToggleSwitch.axaml | 8 +- src/Semi.Avalonia/Themes/Dark/Tooltip.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/TreeView.axaml | 8 +- src/Semi.Avalonia/Themes/Dark/Window.axaml | 4 +- 33 files changed, 235 insertions(+), 235 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml b/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml index e7eae69..eb27257 100644 --- a/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml +++ b/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml index 8768dc3..c401c88 100644 --- a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml @@ -1,5 +1,5 @@ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Border.axaml b/src/Semi.Avalonia/Themes/Dark/Border.axaml index 890f455..e34f532 100644 --- a/src/Semi.Avalonia/Themes/Dark/Border.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml @@ -1,5 +1,5 @@ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml index 354508c..b9acbe2 100644 --- a/src/Semi.Avalonia/Themes/Dark/Button.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml @@ -1,11 +1,11 @@ - - + + - - - + + + @@ -17,45 +17,45 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -63,15 +63,15 @@ - - - + + + - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml index c31a34d..d6d617b 100644 --- a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml @@ -1,5 +1,5 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml index 892dd87..5e83f05 100644 --- a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml @@ -1,27 +1,27 @@ - - + + - - + + - - + + - + - - - + + + diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml index 9dcbc2f..575a03c 100644 --- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml @@ -1,17 +1,17 @@ - - + + - + inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml index a3c7a09..77f474d 100644 --- a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml index 115a47f..c71797e 100644 --- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml @@ -1,29 +1,29 @@ - + - + - - - - - - - + + + + + + + - - + + - - + + - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml index a940542..c72c07c 100644 --- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml @@ -7,26 +7,26 @@ - - + + - - - + + + inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - + - + - + - + - + - + @@ -34,9 +34,9 @@ - + - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml index 78be013..4cf39a0 100644 --- a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml +++ b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml @@ -1,5 +1,5 @@ - + @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml index 559cdc5..78ace21 100644 --- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml @@ -1,17 +1,17 @@ - + - - + + - + diff --git a/src/Semi.Avalonia/Themes/Dark/Expander.axaml b/src/Semi.Avalonia/Themes/Dark/Expander.axaml index 88b8c04..fb8f9fb 100644 --- a/src/Semi.Avalonia/Themes/Dark/Expander.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Expander.axaml @@ -1,6 +1,6 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml index ac41fd7..3fe7e7b 100644 --- a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml @@ -1,6 +1,6 @@ - - + + inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml index 92076c2..48abf98 100644 --- a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml +++ b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml index 5ab93f1..eaf22d6 100644 --- a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml index 316eab6..12d82ce 100644 --- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml @@ -2,11 +2,11 @@ - + - + - + diff --git a/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml index 4d23600..565d07b 100644 --- a/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml index e02ed3c..5872a01 100644 --- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml @@ -2,19 +2,19 @@ - + inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - + - + - + diff --git a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml index b2a2166..21a1d9a 100644 --- a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml +++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml @@ -1,20 +1,20 @@ - - - - - + + + + + inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - + - - + + - + - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml index 9c6ff25..eb725a7 100644 --- a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml @@ -1,15 +1,15 @@ - + - - + + - - - - - - + + + + + + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml index a494094..2008c41 100644 --- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml @@ -6,19 +6,19 @@ - - + + - - - - - - - - + + + + + + + + - + @@ -26,16 +26,16 @@ - - + + - - - + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml b/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml index a77eb29..0cef306 100644 --- a/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml +++ b/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Slider.axaml b/src/Semi.Avalonia/Themes/Dark/Slider.axaml index 7a2d10f..c7081dd 100644 --- a/src/Semi.Avalonia/Themes/Dark/Slider.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Slider.axaml @@ -1,11 +1,11 @@ - + - - - + + + diff --git a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml index 10f729d..ef2e2cd 100644 --- a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml +++ b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml index f70dc56..ec0095d 100644 --- a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml @@ -1,10 +1,10 @@ - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml index 68ca7cc..35f0a40 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml @@ -1,11 +1,11 @@ - + - - - + + + diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml index 0ab6d62..4f652db 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml @@ -5,8 +5,8 @@ - - + + @@ -14,7 +14,7 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml index 2171ee6..7ddd72b 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml @@ -6,70 +6,70 @@ - - + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml index 1397594..5b2cf40 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml @@ -5,10 +5,10 @@ - - - - + + + + 0 4 6 0 #1A000000, 0 0 1 0 #4D000000 diff --git a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml index 5b9f30b..b371c15 100644 --- a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml index 1a63f32..91ab8db 100644 --- a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml @@ -1,13 +1,13 @@ - + - + - + - + diff --git a/src/Semi.Avalonia/Themes/Dark/Window.axaml b/src/Semi.Avalonia/Themes/Dark/Window.axaml index b26cd37..1f95612 100644 --- a/src/Semi.Avalonia/Themes/Dark/Window.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Window.axaml @@ -1,4 +1,4 @@ - - + + \ No newline at end of file From 577006596065ca84e52413a62a4c36687204e8f2 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 28 Dec 2024 00:17:30 +0800 Subject: [PATCH 05/14] misc: Information->Primary except Notification. --- src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/CheckBox.axaml | 8 ++++---- src/Semi.Avalonia/Themes/Dark/ComboBox.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/ListBox.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/RadioButton.axaml | 6 +++--- src/Semi.Avalonia/Themes/Dark/TextBlock.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/TreeView.axaml | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml b/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml index eb27257..37fa75f 100644 --- a/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml +++ b/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml index c71797e..cae6997 100644 --- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml @@ -17,11 +17,11 @@ - - - + + + - + diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml index c72c07c..b0bf1cc 100644 --- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml @@ -27,8 +27,8 @@ - - + + diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml index 12d82ce..e9c34e9 100644 --- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml @@ -7,8 +7,8 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml index 2008c41..c01f0c6 100644 --- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml @@ -12,11 +12,11 @@ - + - + @@ -32,7 +32,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml index 35f0a40..577e50c 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml @@ -7,7 +7,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml index 7ddd72b..c3ec4fa 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml @@ -35,7 +35,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml index 91ab8db..c5e1e56 100644 --- a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml @@ -8,7 +8,7 @@ - + \ No newline at end of file From 40bf46dec54d0924a73f0d566856890c20385cd3 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 28 Dec 2024 01:11:33 +0800 Subject: [PATCH 06/14] misc: Link->Primary except Link. --- src/Semi.Avalonia/Themes/Dark/Button.axaml | 18 +++++++------- src/Semi.Avalonia/Themes/Dark/Calendar.axaml | 6 ++--- .../Themes/Dark/CalendarDatePicker.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/CheckBox.axaml | 22 ++++++++--------- src/Semi.Avalonia/Themes/Dark/ComboBox.axaml | 10 ++++---- .../Themes/Dark/NotificationCard.axaml | 4 ++-- .../Themes/Dark/ProgressBar.axaml | 4 ++-- .../Themes/Dark/RadioButton.axaml | 24 +++++++++---------- .../Themes/Dark/RefreshContainer.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Slider.axaml | 8 +++---- src/Semi.Avalonia/Themes/Dark/TabItem.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/TextBox.axaml | 4 ++-- .../Themes/Dark/ToggleButton.axaml | 18 +++++++------- 13 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml index b9acbe2..0cdd4b6 100644 --- a/src/Semi.Avalonia/Themes/Dark/Button.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml @@ -1,6 +1,6 @@ - + @@ -17,10 +17,10 @@ - - + + - + @@ -36,9 +36,9 @@ - - - + + + @@ -72,6 +72,6 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml index 5e83f05..67ed6de 100644 --- a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml @@ -9,7 +9,7 @@ - + @@ -19,9 +19,9 @@ - + - + diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml index 575a03c..e4118cf 100644 --- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml @@ -6,12 +6,12 @@ - + inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml index cae6997..38b5178 100644 --- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml @@ -6,24 +6,24 @@ - + - - - - - - - + + + + + + + - + - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml index b0bf1cc..4a704ee 100644 --- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml @@ -7,8 +7,8 @@ - - + + @@ -34,9 +34,9 @@ - + - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml index 21a1d9a..ca6096f 100644 --- a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml +++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml index eb725a7..a8885fd 100644 --- a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml @@ -1,10 +1,10 @@ - + - + diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml index c01f0c6..74121bc 100644 --- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml @@ -6,16 +6,16 @@ - - + + - - - + + + - - - + + + @@ -27,15 +27,15 @@ - + - - - + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml b/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml index 0cef306..eec276e 100644 --- a/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml +++ b/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Slider.axaml b/src/Semi.Avalonia/Themes/Dark/Slider.axaml index c7081dd..ba4e368 100644 --- a/src/Semi.Avalonia/Themes/Dark/Slider.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Slider.axaml @@ -1,11 +1,11 @@ - + - - - + + + diff --git a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml index ec0095d..dc8da64 100644 --- a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml @@ -1,7 +1,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml index 4f652db..ba915a9 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml @@ -5,7 +5,7 @@ - + @@ -14,7 +14,7 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml index c3ec4fa..e319377 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml @@ -6,27 +6,27 @@ - + - + - + - + @@ -41,31 +41,31 @@ - + - + - + - + - + From 2424c480709b608eb9026377fd5bafba856e1877 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Fri, 27 Dec 2024 01:23:45 +0800 Subject: [PATCH 07/14] feat: white & black. --- src/Semi.Avalonia/Themes/Dark/Button.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/Carousel.axaml | 12 ++++++------ src/Semi.Avalonia/Themes/Dark/CheckBox.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/RadioButton.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Slider.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/TextBlock.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/TextBox.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Tooltip.axaml | 2 +- src/Semi.Avalonia/Tokens/Palette/Dark.axaml | 15 ++++++++++----- src/Semi.Avalonia/Tokens/Palette/Light.axaml | 6 ++++++ 12 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml index 0cdd4b6..945a216 100644 --- a/src/Semi.Avalonia/Themes/Dark/Button.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml @@ -16,10 +16,10 @@ - + - + diff --git a/src/Semi.Avalonia/Themes/Dark/Carousel.axaml b/src/Semi.Avalonia/Themes/Dark/Carousel.axaml index 4f990b9..608d577 100644 --- a/src/Semi.Avalonia/Themes/Dark/Carousel.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Carousel.axaml @@ -1,8 +1,8 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml index 38b5178..c961249 100644 --- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml @@ -1,8 +1,8 @@ - - + + diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml index 74121bc..f661115 100644 --- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml @@ -17,7 +17,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/Slider.axaml b/src/Semi.Avalonia/Themes/Dark/Slider.axaml index ba4e368..8691619 100644 --- a/src/Semi.Avalonia/Themes/Dark/Slider.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Slider.axaml @@ -2,7 +2,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml index 577e50c..b80d000 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml @@ -12,5 +12,5 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml index ba915a9..5ccdc84 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml @@ -1,5 +1,5 @@ - + @@ -16,5 +16,5 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml index e319377..ea257ca 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml @@ -33,7 +33,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml index 5b2cf40..36200f4 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml @@ -10,6 +10,6 @@ - + 0 4 6 0 #1A000000, 0 0 1 0 #4D000000 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml index b371c15..2eaea56 100644 --- a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml index a2146f5..166a081 100644 --- a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml +++ b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml @@ -1,5 +1,7 @@ + White + Black #6C090B #901110 #B42019 @@ -166,7 +168,8 @@ #43444A #4F5159 - + + @@ -327,6 +330,8 @@ + + @@ -408,12 +413,12 @@ - - - + + + - + diff --git a/src/Semi.Avalonia/Tokens/Palette/Light.axaml b/src/Semi.Avalonia/Tokens/Palette/Light.axaml index 673e4ce..820c25a 100644 --- a/src/Semi.Avalonia/Tokens/Palette/Light.axaml +++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml @@ -1,5 +1,7 @@ + White + Black #FEF2ED #FEDDD2 #FDB7A5 @@ -166,6 +168,8 @@ White White + + @@ -327,6 +331,8 @@ + + From 81f36f6559dab490f2a9d5b83729f028b7dad86d Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 28 Dec 2024 00:13:38 +0800 Subject: [PATCH 08/14] feat: Resources with Opacity. --- src/Semi.Avalonia/Themes/Dark/Calendar.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/TextBox.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml index 67ed6de..0a05e94 100644 --- a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml @@ -13,7 +13,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml index 78ace21..395d2ae 100644 --- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml @@ -13,7 +13,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml index 565d07b..7209c6a 100644 --- a/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml index 5ccdc84..4d94945 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml @@ -4,7 +4,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml index 36200f4..db3cd55 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml @@ -4,7 +4,7 @@ - + From 0f872689a294566efb50276ffa6643a1114eb5ee Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 28 Dec 2024 00:20:33 +0800 Subject: [PATCH 09/14] feat: BoxShadows related. --- src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Border.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/ComboBox.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Flyout.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Menu.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml index c401c88..eac5510 100644 --- a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml @@ -1,5 +1,5 @@ - inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Border.axaml b/src/Semi.Avalonia/Themes/Dark/Border.axaml index e34f532..ffe0ab5 100644 --- a/src/Semi.Avalonia/Themes/Dark/Border.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml @@ -1,5 +1,5 @@ - inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml index e4118cf..efe43bc 100644 --- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml @@ -9,7 +9,7 @@ - inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 + diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml index 4a704ee..8294f86 100644 --- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml @@ -15,7 +15,7 @@ - inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 + diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml index 395d2ae..408f624 100644 --- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml @@ -19,5 +19,5 @@ - inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml index 3fe7e7b..e3d2b46 100644 --- a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml @@ -2,5 +2,5 @@ - inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml index 5872a01..7176aa7 100644 --- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml @@ -4,7 +4,7 @@ - inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 + diff --git a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml index ca6096f..a6eb4a9 100644 --- a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml +++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml @@ -5,7 +5,7 @@ - inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 + From 9947bffa07241a15bd44046e82101aec1146c449 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 28 Dec 2024 02:31:18 +0800 Subject: [PATCH 10/14] misc: SemiColorDisabledText->SemiColorText3. --- src/Semi.Avalonia/Themes/Dark/Calendar.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/CheckBox.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/RadioButton.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/TextBlock.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml index 0a05e94..3a6d10b 100644 --- a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml @@ -12,7 +12,7 @@ - + @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml index c961249..d0d6b2e 100644 --- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml @@ -4,7 +4,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml index f661115..c232295 100644 --- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml @@ -5,7 +5,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml index 277090e..29ff2aa 100644 --- a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml index b80d000..c117b05 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml @@ -2,7 +2,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml index ea257ca..07ce7e9 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml @@ -25,7 +25,7 @@ - + From 3c8ca203375e3f28171253daa0e12044523e46f1 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 28 Dec 2024 14:01:42 +0800 Subject: [PATCH 11/14] feat: LightTheme. --- .../Themes/Light/AdornerLayer.axaml | 4 +- .../Themes/Light/AutoCompleteBox.axaml | 6 +- src/Semi.Avalonia/Themes/Light/Border.axaml | 6 +- src/Semi.Avalonia/Themes/Light/Button.axaml | 137 +++++++--------- .../Themes/Light/ButtonSpinner.axaml | 10 +- src/Semi.Avalonia/Themes/Light/Calendar.axaml | 54 +++---- .../Themes/Light/CalendarDatePicker.axaml | 23 ++- .../Themes/Light/CaptionButtons.axaml | 10 +- src/Semi.Avalonia/Themes/Light/Carousel.axaml | 12 +- src/Semi.Avalonia/Themes/Light/CheckBox.axaml | 61 ++++--- src/Semi.Avalonia/Themes/Light/ComboBox.axaml | 68 ++++---- .../Themes/Light/DataValidationErrors.axaml | 18 +-- .../Themes/Light/DateTimePickerShared.axaml | 39 ++--- src/Semi.Avalonia/Themes/Light/Expander.axaml | 12 +- src/Semi.Avalonia/Themes/Light/Flyout.axaml | 8 +- .../Themes/Light/HeaderedContentControl.axaml | 4 +- .../Themes/Light/HyperlinkButton.axaml | 8 +- src/Semi.Avalonia/Themes/Light/ListBox.axaml | 19 ++- .../Themes/Light/ManagedFileChooser.axaml | 4 +- src/Semi.Avalonia/Themes/Light/Menu.axaml | 33 ++-- .../Themes/Light/NotificationCard.axaml | 37 +++-- .../Themes/Light/ProgressBar.axaml | 22 +-- .../Themes/Light/RadioButton.axaml | 72 ++++----- .../Themes/Light/RefreshContainer.axaml | 2 +- .../Themes/Light/ScrollViewer.axaml | 8 +- src/Semi.Avalonia/Themes/Light/Slider.axaml | 14 +- .../Themes/Light/SplitView.axaml | 4 +- src/Semi.Avalonia/Themes/Light/TabItem.axaml | 13 +- .../Themes/Light/TextBlock.axaml | 27 ++-- src/Semi.Avalonia/Themes/Light/TextBox.axaml | 28 ++-- .../Themes/Light/ToggleButton.axaml | 151 ++++++++---------- .../Themes/Light/ToggleSwitch.axaml | 25 ++- src/Semi.Avalonia/Themes/Light/Tooltip.axaml | 4 +- src/Semi.Avalonia/Themes/Light/TreeView.axaml | 21 ++- src/Semi.Avalonia/Themes/Light/Window.axaml | 4 +- 35 files changed, 439 insertions(+), 529 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml b/src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml index 976e2f0..37fa75f 100644 --- a/src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml +++ b/src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml index 24d2c0e..c84e0fe 100644 --- a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml @@ -1,5 +1,5 @@ - 0 0 1 #4A000000, 0 4 14 #1A000000 - - + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Border.axaml b/src/Semi.Avalonia/Themes/Light/Border.axaml index 9a473d0..ffe0ab5 100644 --- a/src/Semi.Avalonia/Themes/Light/Border.axaml +++ b/src/Semi.Avalonia/Themes/Light/Border.axaml @@ -1,5 +1,5 @@ - 0 0 1 #4A000000, 0 4 14 #1A000000 - - + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Button.axaml b/src/Semi.Avalonia/Themes/Light/Button.axaml index 4365120..945a216 100644 --- a/src/Semi.Avalonia/Themes/Light/Button.axaml +++ b/src/Semi.Avalonia/Themes/Light/Button.axaml @@ -1,96 +1,77 @@ - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml index 0e7e367..d1c798b 100644 --- a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml +++ b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml @@ -1,9 +1,9 @@ - - + + - + - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Calendar.axaml b/src/Semi.Avalonia/Themes/Light/Calendar.axaml index 92a51ef..42727dc 100644 --- a/src/Semi.Avalonia/Themes/Light/Calendar.axaml +++ b/src/Semi.Avalonia/Themes/Light/Calendar.axaml @@ -1,35 +1,29 @@ - - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml index 293451b..3a298b9 100644 --- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml @@ -1,18 +1,17 @@ - - - - - - + + + + - - + + + + - 0 0 1 #4A000000, 0 4 14 #1A000000 - + - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml index 5846e21..77f474d 100644 --- a/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml +++ b/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml @@ -1,7 +1,7 @@ - - - - - + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Carousel.axaml b/src/Semi.Avalonia/Themes/Light/Carousel.axaml index 4f990b9..608d577 100644 --- a/src/Semi.Avalonia/Themes/Light/Carousel.axaml +++ b/src/Semi.Avalonia/Themes/Light/Carousel.axaml @@ -1,8 +1,8 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml index 7b8f707..d0d6b2e 100644 --- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml @@ -1,36 +1,29 @@ - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml index 5dd62ad..4df35d1 100644 --- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml @@ -1,48 +1,42 @@ - - - - - - + + + + + + - - - - - - - - - - - 0 0 1 #4A000000, 0 4 14 #1A000000 - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - + - + - + - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml index f84359d..4cf39a0 100644 --- a/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml +++ b/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml @@ -1,11 +1,11 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml index 24d691b..72c86de 100644 --- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml @@ -1,32 +1,23 @@ - + - + - - - - + + + - - - - - - + + + - - - - - - - + + + + + - + - - 0 0 1 #4A000000, 0 4 14 #1A000000 + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Expander.axaml b/src/Semi.Avalonia/Themes/Light/Expander.axaml index 15b20ad..fb8f9fb 100644 --- a/src/Semi.Avalonia/Themes/Light/Expander.axaml +++ b/src/Semi.Avalonia/Themes/Light/Expander.axaml @@ -1,9 +1,9 @@ - - - + + + - - - + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Flyout.axaml b/src/Semi.Avalonia/Themes/Light/Flyout.axaml index 85ef491..e3d2b46 100644 --- a/src/Semi.Avalonia/Themes/Light/Flyout.axaml +++ b/src/Semi.Avalonia/Themes/Light/Flyout.axaml @@ -1,6 +1,6 @@ - - - - 0 0 1 #4A000000, 0 4 14 #1A000000 + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml index 501435b..888e10d 100644 --- a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml +++ b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml @@ -1,4 +1,4 @@  - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml index c7356e7..aa23021 100644 --- a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml +++ b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml @@ -1,7 +1,7 @@ - - - - + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ListBox.axaml b/src/Semi.Avalonia/Themes/Light/ListBox.axaml index 5cc327d..e9c34e9 100644 --- a/src/Semi.Avalonia/Themes/Light/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/ListBox.axaml @@ -1,15 +1,14 @@ - - + - - - - - - - + + + + + + + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml index b00dcac..7209c6a 100644 --- a/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml +++ b/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Light/Menu.axaml index 254beca..d7216e7 100644 --- a/src/Semi.Avalonia/Themes/Light/Menu.axaml +++ b/src/Semi.Avalonia/Themes/Light/Menu.axaml @@ -1,26 +1,21 @@ - - - + + - - - 0 0 1 #4A000000, 0 4 14 #1A000000 - + + + - - - - - - - + + + + + - - - - + + + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml index e1c5732..a6eb4a9 100644 --- a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml +++ b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml @@ -1,21 +1,20 @@ - - - - - - - 0 0 1 #4A000000, 0 4 14 #1A000000 - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml index ff03bf3..a8885fd 100644 --- a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml +++ b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml @@ -1,15 +1,15 @@ - - - - + + + + - - - - - - + + + + + + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml index 87ef1d9..c232295 100644 --- a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml @@ -1,49 +1,41 @@ - - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + - - - - - - - + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml b/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml index e67b05b..eec276e 100644 --- a/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml +++ b/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml index e4f881d..29ff2aa 100644 --- a/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml +++ b/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml @@ -1,7 +1,7 @@ - - - - + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Slider.axaml b/src/Semi.Avalonia/Themes/Light/Slider.axaml index bb1d311..f6bf1e0 100644 --- a/src/Semi.Avalonia/Themes/Light/Slider.axaml +++ b/src/Semi.Avalonia/Themes/Light/Slider.axaml @@ -1,13 +1,11 @@ - - - + + - - - - - + + + + diff --git a/src/Semi.Avalonia/Themes/Light/SplitView.axaml b/src/Semi.Avalonia/Themes/Light/SplitView.axaml index fc36c21..97e1cc4 100644 --- a/src/Semi.Avalonia/Themes/Light/SplitView.axaml +++ b/src/Semi.Avalonia/Themes/Light/SplitView.axaml @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/TabItem.axaml b/src/Semi.Avalonia/Themes/Light/TabItem.axaml index 4e08d73..dc8da64 100644 --- a/src/Semi.Avalonia/Themes/Light/TabItem.axaml +++ b/src/Semi.Avalonia/Themes/Light/TabItem.axaml @@ -1,11 +1,10 @@ - - - - - - - + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/TextBlock.axaml b/src/Semi.Avalonia/Themes/Light/TextBlock.axaml index 0cda42b..c117b05 100644 --- a/src/Semi.Avalonia/Themes/Light/TextBlock.axaml +++ b/src/Semi.Avalonia/Themes/Light/TextBlock.axaml @@ -1,17 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Light/TextBox.axaml index 08d6fa4..a4cd946 100644 --- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml @@ -1,24 +1,20 @@ - - + - - + + - - - - - - - + + + + + + - - + - - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml index b2e2767..07ce7e9 100644 --- a/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml +++ b/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml @@ -1,88 +1,75 @@ - - - + + + - - - + + - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml index 3a00f8c..db3cd55 100644 --- a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml +++ b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml @@ -1,20 +1,15 @@ - - - - + + + - - - - - - - - - - - + + + + + + + 0 4 6 0 #1A000000, 0 0 1 0 #4D000000 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Tooltip.axaml b/src/Semi.Avalonia/Themes/Light/Tooltip.axaml index 4a81dce..0f2ef79 100644 --- a/src/Semi.Avalonia/Themes/Light/Tooltip.axaml +++ b/src/Semi.Avalonia/Themes/Light/Tooltip.axaml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/TreeView.axaml b/src/Semi.Avalonia/Themes/Light/TreeView.axaml index c4cc03c..c5e1e56 100644 --- a/src/Semi.Avalonia/Themes/Light/TreeView.axaml +++ b/src/Semi.Avalonia/Themes/Light/TreeView.axaml @@ -1,15 +1,14 @@ - - - - - + + + + - - - - - + + + + + - + \ 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 b2e8f39..1f95612 100644 --- a/src/Semi.Avalonia/Themes/Light/Window.axaml +++ b/src/Semi.Avalonia/Themes/Light/Window.axaml @@ -1,4 +1,4 @@ - - + + \ No newline at end of file From 154a005b84e517f97cadf2e4787028756a5cd0fb Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 28 Dec 2024 16:47:46 +0800 Subject: [PATCH 12/14] misc: add missing basic brushes. --- src/Semi.Avalonia/Tokens/Palette/Dark.axaml | 21 +++++++++++++------- src/Semi.Avalonia/Tokens/Palette/Light.axaml | 21 +++++++++++++------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml index 166a081..75b0621 100644 --- a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml +++ b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml @@ -335,7 +335,6 @@ - @@ -344,7 +343,6 @@ - @@ -353,7 +351,6 @@ - @@ -361,7 +358,6 @@ - @@ -370,7 +366,6 @@ - @@ -379,7 +374,6 @@ - @@ -387,7 +381,6 @@ - @@ -419,6 +412,11 @@ + + + + + @@ -430,4 +428,13 @@ 0 0 #0A000000 inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000 + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Tokens/Palette/Light.axaml b/src/Semi.Avalonia/Tokens/Palette/Light.axaml index 820c25a..a489b3c 100644 --- a/src/Semi.Avalonia/Tokens/Palette/Light.axaml +++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml @@ -336,7 +336,6 @@ - @@ -345,7 +344,6 @@ - @@ -354,7 +352,6 @@ - @@ -362,7 +359,6 @@ - @@ -371,7 +367,6 @@ - @@ -380,7 +375,6 @@ - @@ -388,7 +382,6 @@ - @@ -420,6 +413,11 @@ + + + + + @@ -431,4 +429,13 @@ 0 0 #0A000000 0 0 1 #4A000000, 0 4 14 #1A000000 + + + + + + + + + \ No newline at end of file From 19285645ee2ca372e56420baa692e76c3a8fd77f Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 28 Dec 2024 18:48:47 +0800 Subject: [PATCH 13/14] feat: unified colors. --- demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml | 8 ++++---- src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/Menu.axaml | 4 ++-- src/Semi.Avalonia/Themes/Dark/SplitView.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/TextBox.axaml | 2 +- src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml | 2 +- src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml | 2 +- src/Semi.Avalonia/Themes/Light/GridSplitter.axaml | 4 ++-- src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml | 4 ++-- src/Semi.Avalonia/Themes/Light/Menu.axaml | 4 ++-- src/Semi.Avalonia/Themes/Light/SplitView.axaml | 2 +- src/Semi.Avalonia/Themes/Light/TextBox.axaml | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml index ef965c6..01f9480 100644 --- a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml @@ -14,13 +14,13 @@ RowDefinitions="*, Auto, *"> diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml index efe43bc..a8b5559 100644 --- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml @@ -8,7 +8,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml index 408f624..45b9d4a 100644 --- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml index f7b2f61..ffd69e9 100644 --- a/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml +++ b/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml index eaf22d6..843a43b 100644 --- a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml index 7176aa7..e56bf75 100644 --- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml @@ -12,10 +12,10 @@ - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml index ef2e2cd..f135caf 100644 --- a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml +++ b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml index 4d94945..ed254e8 100644 --- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml index 3a298b9..a8b5559 100644 --- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml @@ -8,7 +8,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml index 72c86de..45b9d4a 100644 --- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml index 2667522..ffd69e9 100644 --- a/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml +++ b/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml index aa23021..843a43b 100644 --- a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml +++ b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Light/Menu.axaml index d7216e7..e56bf75 100644 --- a/src/Semi.Avalonia/Themes/Light/Menu.axaml +++ b/src/Semi.Avalonia/Themes/Light/Menu.axaml @@ -12,10 +12,10 @@ - + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/SplitView.axaml b/src/Semi.Avalonia/Themes/Light/SplitView.axaml index 97e1cc4..f135caf 100644 --- a/src/Semi.Avalonia/Themes/Light/SplitView.axaml +++ b/src/Semi.Avalonia/Themes/Light/SplitView.axaml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Light/TextBox.axaml index a4cd946..d46e735 100644 --- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml @@ -15,6 +15,6 @@ - + \ No newline at end of file From 049552f2546e1a9ce6588e65467742ef627b5593 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:21:28 +0800 Subject: [PATCH 14/14] feat: rearrange Resource tree. --- demo/Semi.Avalonia.Demo/App.axaml | 4 ++-- src/Semi.Avalonia/{Themes => }/Index.axaml | 11 ++++++++--- .../AquaticScheme.axaml} | 0 .../DarkTheme.axaml => Schemes/DarkScheme.axaml} | 0 .../DesertTheme.axaml => Schemes/DesertScheme.axaml} | 0 .../DuskTheme.axaml => Schemes/DuskScheme.axaml} | 0 .../LightTheme.axaml => Schemes/LightScheme.axaml} | 0 .../NightSkyScheme.axaml} | 0 src/Semi.Avalonia/{Themes => }/SemiTheme.axaml | 12 ++++++------ src/Semi.Avalonia/{Themes => }/SemiTheme.axaml.cs | 0 src/Semi.Avalonia/Themes/DarkTheme.axaml | 11 ----------- src/Semi.Avalonia/Themes/LightTheme.axaml | 11 ----------- 12 files changed, 16 insertions(+), 33 deletions(-) rename src/Semi.Avalonia/{Themes => }/Index.axaml (57%) rename src/Semi.Avalonia/{Themes/Schemes/AquaticTheme.axaml => Schemes/AquaticScheme.axaml} (100%) rename src/Semi.Avalonia/{Themes/Schemes/DarkTheme.axaml => Schemes/DarkScheme.axaml} (100%) rename src/Semi.Avalonia/{Themes/Schemes/DesertTheme.axaml => Schemes/DesertScheme.axaml} (100%) rename src/Semi.Avalonia/{Themes/Schemes/DuskTheme.axaml => Schemes/DuskScheme.axaml} (100%) rename src/Semi.Avalonia/{Themes/Schemes/LightTheme.axaml => Schemes/LightScheme.axaml} (100%) rename src/Semi.Avalonia/{Themes/Schemes/NightSkyTheme.axaml => Schemes/NightSkyScheme.axaml} (100%) rename src/Semi.Avalonia/{Themes => }/SemiTheme.axaml (76%) rename src/Semi.Avalonia/{Themes => }/SemiTheme.axaml.cs (100%) delete mode 100644 src/Semi.Avalonia/Themes/DarkTheme.axaml delete mode 100644 src/Semi.Avalonia/Themes/LightTheme.axaml diff --git a/demo/Semi.Avalonia.Demo/App.axaml b/demo/Semi.Avalonia.Demo/App.axaml index c3605fa..3de4aaa 100644 --- a/demo/Semi.Avalonia.Demo/App.axaml +++ b/demo/Semi.Avalonia.Demo/App.axaml @@ -5,8 +5,8 @@ xmlns:semi="https://irihi.tech/semi"> - - + + diff --git a/src/Semi.Avalonia/Themes/Index.axaml b/src/Semi.Avalonia/Index.axaml similarity index 57% rename from src/Semi.Avalonia/Themes/Index.axaml rename to src/Semi.Avalonia/Index.axaml index dc9ff25..013498e 100644 --- a/src/Semi.Avalonia/Themes/Index.axaml +++ b/src/Semi.Avalonia/Index.axaml @@ -1,9 +1,14 @@ - + - - + + + + + + diff --git a/src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml b/src/Semi.Avalonia/Schemes/AquaticScheme.axaml similarity index 100% rename from src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml rename to src/Semi.Avalonia/Schemes/AquaticScheme.axaml diff --git a/src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml b/src/Semi.Avalonia/Schemes/DarkScheme.axaml similarity index 100% rename from src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml rename to src/Semi.Avalonia/Schemes/DarkScheme.axaml diff --git a/src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml b/src/Semi.Avalonia/Schemes/DesertScheme.axaml similarity index 100% rename from src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml rename to src/Semi.Avalonia/Schemes/DesertScheme.axaml diff --git a/src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml b/src/Semi.Avalonia/Schemes/DuskScheme.axaml similarity index 100% rename from src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml rename to src/Semi.Avalonia/Schemes/DuskScheme.axaml diff --git a/src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml b/src/Semi.Avalonia/Schemes/LightScheme.axaml similarity index 100% rename from src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml rename to src/Semi.Avalonia/Schemes/LightScheme.axaml diff --git a/src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml b/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml similarity index 100% rename from src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml rename to src/Semi.Avalonia/Schemes/NightSkyScheme.axaml diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/SemiTheme.axaml similarity index 76% rename from src/Semi.Avalonia/Themes/SemiTheme.axaml rename to src/Semi.Avalonia/SemiTheme.axaml index 3412a7f..8d158b8 100644 --- a/src/Semi.Avalonia/Themes/SemiTheme.axaml +++ b/src/Semi.Avalonia/SemiTheme.axaml @@ -3,12 +3,12 @@ - - - - - - + + + + + + diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs b/src/Semi.Avalonia/SemiTheme.axaml.cs similarity index 100% rename from src/Semi.Avalonia/Themes/SemiTheme.axaml.cs rename to src/Semi.Avalonia/SemiTheme.axaml.cs diff --git a/src/Semi.Avalonia/Themes/DarkTheme.axaml b/src/Semi.Avalonia/Themes/DarkTheme.axaml deleted file mode 100644 index 393d404..0000000 --- a/src/Semi.Avalonia/Themes/DarkTheme.axaml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/LightTheme.axaml b/src/Semi.Avalonia/Themes/LightTheme.axaml deleted file mode 100644 index aeae5cc..0000000 --- a/src/Semi.Avalonia/Themes/LightTheme.axaml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file