From 6f4c0dd5cd73cb4ac12059197a6adf7b7aa8bb3c Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sun, 26 Mar 2023 21:37:32 +0800 Subject: [PATCH] feat: color order. --- .../ViewModels/PaletteDemoViewModel.cs | 8 +- src/Semi.Avalonia/Themes/Light/Palette.axaml | 240 +++++++++--------- 2 files changed, 127 insertions(+), 121 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs index 75fe787..5509a29 100644 --- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs +++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs @@ -11,7 +11,13 @@ namespace Semi.Avalonia.Demo.ViewModels; public class PaletteDemoViewModel: ObservableObject { - private readonly string[] _predefinedColorNames = { "Amber","Blue","Cyan","Green","Grey","Indigo","LightBlue","LightGreen","Lime","Orange","Pink","Purple","Red","Teal","Violet","Yellow" }; + private readonly string[] _predefinedColorNames = + { + "Red", "Pink", "Purple", "Violet", "Indigo", + "Blue", "LightBlue", "Cyan", "Teal", "Green", + "LightGreen", "Lime", "Yellow", "Amber", "Orange", + "Grey" + }; private readonly IResourceDictionary? _lightResourceDictionary; private readonly IResourceDictionary? _darkResourceDictionary; diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml index 60681b9..25e68d3 100644 --- a/src/Semi.Avalonia/Themes/Light/Palette.axaml +++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml @@ -1,105 +1,15 @@ - #FEFBEB - #FCF5CE - #F9E89E - #F6D86F - #F3C641 - #F0B114 - #C88A0F - #A0660A - #784606 - #502B03 - #EAF5FF - #CBE7FE - #98CDFD - #65B2FC - #3295FB - #0077FA - #0062D6 - #004FB3 - #003D8F - #002C6B - #E5F7F8 - #C2EFF0 - #8ADDE2 - #58CBD3 - #2CB8C5 - #05A4B6 - #038698 - #016979 - #004D5B - #00323D - #ECF7EC - #D0F0D1 - #A4E0A7 - #7DD182 - #5AC262 - #3BB346 - #30953B - #25772F - #1B5924 - #113C18 - #F9F9F9 - #E6E8EA - #C6CACD - #A7ABB0 - #888D92 - #6B7075 - #555B61 - #41464C - #2E3238 - #1C1F23 - #ECEFF8 - #D1D8F0 - #A7B3E1 - #8090D3 - #5E6FC4 - #3F51B5 - #3342A1 - #28348C - #1F2878 - #171D63 - #E9F7FD - #C9ECFC - #95D8F8 - #62C3F5 - #30ACF1 - #0095EE - #007BCA - #0063A7 - #004B83 - #00355F - #F3F8EC - #E3F0D0 - #C8E2A5 - #ADD37E - #93C55B - #7BB63C - #649830 - #4E7926 - #395B1B - #253D12 - #F2FAE6 - #E3F6C5 - #CBED8E - #B7E35B - #A7DA2C - #9BD100 - #7EAE00 - #638B00 - #486800 - #2F4600 - #FFF8EA - #FEEECC - #FED998 - #FDC165 - #FDA633 - #FC8800 - #D26700 - #A84A00 - #7E3100 - #541D00 + #FEF2ED + #FEDDD2 + #FDB7A5 + #FB9078 + #FA664C + #F93920 + #D52515 + #B2140C + #8E0805 + #6A0103 #FDECEF #FBCFD8 #F6A0B5 @@ -120,26 +30,6 @@ #71168A #5C0F75 #490A61 - #FEF2ED - #FEDDD2 - #FDB7A5 - #FB9078 - #FA664C - #F93920 - #D52515 - #B2140C - #8E0805 - #6A0103 - #E4F7F4 - #C0F0E8 - #87E0D3 - #54D1C1 - #27C2B0 - #00B3A1 - #009589 - #00776F - #005955 - #003C3A #F3EDF9 #E2D1F4 #C4A7E9 @@ -150,6 +40,86 @@ #46259E #361C8A #281475 + #ECEFF8 + #D1D8F0 + #A7B3E1 + #8090D3 + #5E6FC4 + #3F51B5 + #3342A1 + #28348C + #1F2878 + #171D63 + #EAF5FF + #CBE7FE + #98CDFD + #65B2FC + #3295FB + #0077FA + #0062D6 + #004FB3 + #003D8F + #002C6B + #E9F7FD + #C9ECFC + #95D8F8 + #62C3F5 + #30ACF1 + #0095EE + #007BCA + #0063A7 + #004B83 + #00355F + #E5F7F8 + #C2EFF0 + #8ADDE2 + #58CBD3 + #2CB8C5 + #05A4B6 + #038698 + #016979 + #004D5B + #00323D + #E4F7F4 + #C0F0E8 + #87E0D3 + #54D1C1 + #27C2B0 + #00B3A1 + #009589 + #00776F + #005955 + #003C3A + #ECF7EC + #D0F0D1 + #A4E0A7 + #7DD182 + #5AC262 + #3BB346 + #30953B + #25772F + #1B5924 + #113C18 + #F3F8EC + #E3F0D0 + #C8E2A5 + #ADD37E + #93C55B + #7BB63C + #649830 + #4E7926 + #395B1B + #253D12 + #F2FAE6 + #E3F6C5 + #CBED8E + #B7E35B + #A7DA2C + #9BD100 + #7EAE00 + #638B00 + #486800 + #2F4600 #FFFDEA #FEFBCB #FDF398 @@ -160,6 +130,36 @@ #A78B00 #7D6A00 #534800 + #FEFBEB + #FCF5CE + #F9E89E + #F6D86F + #F3C641 + #F0B114 + #C88A0F + #A0660A + #784606 + #502B03 + #FFF8EA + #FEEECC + #FED998 + #FDC165 + #FDA633 + #FC8800 + #D26700 + #A84A00 + #7E3100 + #541D00 + #F9F9F9 + #E6E8EA + #C6CACD + #A7ABB0 + #888D92 + #6B7075 + #555B61 + #41464C + #2E3238 + #1C1F23