From b19a576dc953f69d968815d68074936a86c1fa07 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 11 Jul 2023 17:38:31 +0800
Subject: [PATCH 1/2] fix: label color order.

---
 demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml |  72 ++--
 src/Semi.Avalonia/Controls/Label.axaml        | 320 +++++++++---------
 src/Semi.Avalonia/Themes/Dark/Label.axaml     | 122 +++----
 3 files changed, 257 insertions(+), 257 deletions(-)

diff --git a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
index e993eba..90f2676 100644
--- a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
@@ -165,60 +165,60 @@
                 <Label Classes="Large Circle" Theme="{StaticResource TagLabel}">Large Circle Label</Label>
             </WrapPanel>
             <WrapPanel>
-                <Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
-                <Label Classes="Blue" Theme="{StaticResource TagLabel}">Blue</Label>
-                <Label Classes="Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
-                <Label Classes="Green" Theme="{StaticResource TagLabel}">Green</Label>
-                <Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
-                <Label Classes="Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
-                <Label Classes="LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
-                <Label Classes="LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
-                <Label Classes="Lime" Theme="{StaticResource TagLabel}">Lime</Label>
-                <Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Red" Theme="{StaticResource TagLabel}">Red</Label>
                 <Label Classes="Pink" Theme="{StaticResource TagLabel}">Pink</Label>
                 <Label Classes="Purple" Theme="{StaticResource TagLabel}">Purple</Label>
-                <Label Classes="Red" Theme="{StaticResource TagLabel}">Red</Label>
-                <Label Classes="Teal" Theme="{StaticResource TagLabel}">Teal</Label>
                 <Label Classes="Violet" Theme="{StaticResource TagLabel}">Violet</Label>
+                <Label Classes="Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
+                <Label Classes="Blue" Theme="{StaticResource TagLabel}">Blue</Label>
+                <Label Classes="LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
+                <Label Classes="Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
+                <Label Classes="Teal" Theme="{StaticResource TagLabel}">Teal</Label>
+                <Label Classes="Green" Theme="{StaticResource TagLabel}">Green</Label>
+                <Label Classes="LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
+                <Label Classes="Lime" Theme="{StaticResource TagLabel}">Lime</Label>
                 <Label Classes="Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
+                <Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                <Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
                 <Label Classes="White" Theme="{StaticResource TagLabel}">White</Label>
             </WrapPanel>
             <WrapPanel>
-                <Label Classes="Ghost Amber" Theme="{StaticResource TagLabel}">Amber</Label>
-                <Label Classes="Ghost Blue" Theme="{StaticResource TagLabel}">Blue</Label>
-                <Label Classes="Ghost Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
-                <Label Classes="Ghost Green" Theme="{StaticResource TagLabel}">Green</Label>
-                <Label Classes="Ghost Grey" Theme="{StaticResource TagLabel}">Grey</Label>
-                <Label Classes="Ghost Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
-                <Label Classes="Ghost LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
-                <Label Classes="Ghost LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
-                <Label Classes="Ghost Lime" Theme="{StaticResource TagLabel}">Lime</Label>
-                <Label Classes="Ghost Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Ghost Red" Theme="{StaticResource TagLabel}">Red</Label>
                 <Label Classes="Ghost Pink" Theme="{StaticResource TagLabel}">Pink</Label>
                 <Label Classes="Ghost Purple" Theme="{StaticResource TagLabel}">Purple</Label>
-                <Label Classes="Ghost Red" Theme="{StaticResource TagLabel}">Red</Label>
-                <Label Classes="Ghost Teal" Theme="{StaticResource TagLabel}">Teal</Label>
                 <Label Classes="Ghost Violet" Theme="{StaticResource TagLabel}">Violet</Label>
+                <Label Classes="Ghost Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
+                <Label Classes="Ghost Blue" Theme="{StaticResource TagLabel}">Blue</Label>
+                <Label Classes="Ghost LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
+                <Label Classes="Ghost Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
+                <Label Classes="Ghost Teal" Theme="{StaticResource TagLabel}">Teal</Label>
+                <Label Classes="Ghost Green" Theme="{StaticResource TagLabel}">Green</Label>
+                <Label Classes="Ghost LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
+                <Label Classes="Ghost Lime" Theme="{StaticResource TagLabel}">Lime</Label>
                 <Label Classes="Ghost Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
+                <Label Classes="Ghost Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                <Label Classes="Ghost Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Ghost Grey" Theme="{StaticResource TagLabel}">Grey</Label>
                 <Label Classes="Ghost White" Theme="{StaticResource TagLabel}">White</Label>
             </WrapPanel>
             <WrapPanel>
-                <Label Classes="Solid Amber" Theme="{StaticResource TagLabel}">Amber</Label>
-                <Label Classes="Solid Blue" Theme="{StaticResource TagLabel}">Blue</Label>
-                <Label Classes="Solid Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
-                <Label Classes="Solid Green" Theme="{StaticResource TagLabel}">Green</Label>
-                <Label Classes="Solid Grey" Theme="{StaticResource TagLabel}">Grey</Label>
-                <Label Classes="Solid Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
-                <Label Classes="Solid LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
-                <Label Classes="Solid LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
-                <Label Classes="Solid Lime" Theme="{StaticResource TagLabel}">Lime</Label>
-                <Label Classes="Solid Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Solid Red" Theme="{StaticResource TagLabel}">Red</Label>
                 <Label Classes="Solid Pink" Theme="{StaticResource TagLabel}">Pink</Label>
                 <Label Classes="Solid Purple" Theme="{StaticResource TagLabel}">Purple</Label>
-                <Label Classes="Solid Red" Theme="{StaticResource TagLabel}">Red</Label>
-                <Label Classes="Solid Teal" Theme="{StaticResource TagLabel}">Teal</Label>
                 <Label Classes="Solid Violet" Theme="{StaticResource TagLabel}">Violet</Label>
+                <Label Classes="Solid Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
+                <Label Classes="Solid Blue" Theme="{StaticResource TagLabel}">Blue</Label>
+                <Label Classes="Solid LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
+                <Label Classes="Solid Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
+                <Label Classes="Solid Teal" Theme="{StaticResource TagLabel}">Teal</Label>
+                <Label Classes="Solid Green" Theme="{StaticResource TagLabel}">Green</Label>
+                <Label Classes="Solid LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
+                <Label Classes="Solid Lime" Theme="{StaticResource TagLabel}">Lime</Label>
                 <Label Classes="Solid Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
+                <Label Classes="Solid Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                <Label Classes="Solid Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Solid Grey" Theme="{StaticResource TagLabel}">Grey</Label>
                 <Label Classes="Solid White" Theme="{StaticResource TagLabel}">White</Label>
             </WrapPanel>
         </StackPanel>
diff --git a/src/Semi.Avalonia/Controls/Label.axaml b/src/Semi.Avalonia/Controls/Label.axaml
index 1f5945d..5848b77 100644
--- a/src/Semi.Avalonia/Controls/Label.axaml
+++ b/src/Semi.Avalonia/Controls/Label.axaml
@@ -20,60 +20,60 @@
                 <Label Classes="Large Circle" Theme="{StaticResource TagLabel}">Large Circle Label</Label>
             </WrapPanel>
             <WrapPanel>
-                <Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
-                <Label Classes="Blue" Theme="{StaticResource TagLabel}">Blue</Label>
-                <Label Classes="Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
-                <Label Classes="Green" Theme="{StaticResource TagLabel}">Green</Label>
-                <Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
-                <Label Classes="Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
-                <Label Classes="LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
-                <Label Classes="LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
-                <Label Classes="Lime" Theme="{StaticResource TagLabel}">Lime</Label>
-                <Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Red" Theme="{StaticResource TagLabel}">Red</Label>
                 <Label Classes="Pink" Theme="{StaticResource TagLabel}">Pink</Label>
                 <Label Classes="Purple" Theme="{StaticResource TagLabel}">Purple</Label>
-                <Label Classes="Red" Theme="{StaticResource TagLabel}">Red</Label>
-                <Label Classes="Teal" Theme="{StaticResource TagLabel}">Teal</Label>
                 <Label Classes="Violet" Theme="{StaticResource TagLabel}">Violet</Label>
+                <Label Classes="Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
+                <Label Classes="Blue" Theme="{StaticResource TagLabel}">Blue</Label>
+                <Label Classes="LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
+                <Label Classes="Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
+                <Label Classes="Teal" Theme="{StaticResource TagLabel}">Teal</Label>
+                <Label Classes="Green" Theme="{StaticResource TagLabel}">Green</Label>
+                <Label Classes="LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
+                <Label Classes="Lime" Theme="{StaticResource TagLabel}">Lime</Label>
                 <Label Classes="Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
+                <Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                <Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
                 <Label Classes="White" Theme="{StaticResource TagLabel}">White</Label>
             </WrapPanel>
             <WrapPanel>
-                <Label Classes="Ghost Amber" Theme="{StaticResource TagLabel}">Amber</Label>
-                <Label Classes="Ghost Blue" Theme="{StaticResource TagLabel}">Blue</Label>
-                <Label Classes="Ghost Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
-                <Label Classes="Ghost Green" Theme="{StaticResource TagLabel}">Green</Label>
-                <Label Classes="Ghost Grey" Theme="{StaticResource TagLabel}">Grey</Label>
-                <Label Classes="Ghost Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
-                <Label Classes="Ghost LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
-                <Label Classes="Ghost LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
-                <Label Classes="Ghost Lime" Theme="{StaticResource TagLabel}">Lime</Label>
-                <Label Classes="Ghost Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Ghost Red" Theme="{StaticResource TagLabel}">Red</Label>
                 <Label Classes="Ghost Pink" Theme="{StaticResource TagLabel}">Pink</Label>
                 <Label Classes="Ghost Purple" Theme="{StaticResource TagLabel}">Purple</Label>
-                <Label Classes="Ghost Red" Theme="{StaticResource TagLabel}">Red</Label>
-                <Label Classes="Ghost Teal" Theme="{StaticResource TagLabel}">Teal</Label>
                 <Label Classes="Ghost Violet" Theme="{StaticResource TagLabel}">Violet</Label>
+                <Label Classes="Ghost Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
+                <Label Classes="Ghost Blue" Theme="{StaticResource TagLabel}">Blue</Label>
+                <Label Classes="Ghost LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
+                <Label Classes="Ghost Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
+                <Label Classes="Ghost Teal" Theme="{StaticResource TagLabel}">Teal</Label>
+                <Label Classes="Ghost Green" Theme="{StaticResource TagLabel}">Green</Label>
+                <Label Classes="Ghost LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
+                <Label Classes="Ghost Lime" Theme="{StaticResource TagLabel}">Lime</Label>
                 <Label Classes="Ghost Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
+                <Label Classes="Ghost Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                <Label Classes="Ghost Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Ghost Grey" Theme="{StaticResource TagLabel}">Grey</Label>
                 <Label Classes="Ghost White" Theme="{StaticResource TagLabel}">White</Label>
             </WrapPanel>
             <WrapPanel>
-                <Label Classes="Solid Amber" Theme="{StaticResource TagLabel}">Amber</Label>
-                <Label Classes="Solid Blue" Theme="{StaticResource TagLabel}">Blue</Label>
-                <Label Classes="Solid Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
-                <Label Classes="Solid Green" Theme="{StaticResource TagLabel}">Green</Label>
-                <Label Classes="Solid Grey" Theme="{StaticResource TagLabel}">Grey</Label>
-                <Label Classes="Solid Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
-                <Label Classes="Solid LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
-                <Label Classes="Solid LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
-                <Label Classes="Solid Lime" Theme="{StaticResource TagLabel}">Lime</Label>
-                <Label Classes="Solid Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Solid Red" Theme="{StaticResource TagLabel}">Red</Label>
                 <Label Classes="Solid Pink" Theme="{StaticResource TagLabel}">Pink</Label>
                 <Label Classes="Solid Purple" Theme="{StaticResource TagLabel}">Purple</Label>
-                <Label Classes="Solid Red" Theme="{StaticResource TagLabel}">Red</Label>
-                <Label Classes="Solid Teal" Theme="{StaticResource TagLabel}">Teal</Label>
                 <Label Classes="Solid Violet" Theme="{StaticResource TagLabel}">Violet</Label>
+                <Label Classes="Solid Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
+                <Label Classes="Solid Blue" Theme="{StaticResource TagLabel}">Blue</Label>
+                <Label Classes="Solid LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
+                <Label Classes="Solid Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
+                <Label Classes="Solid Teal" Theme="{StaticResource TagLabel}">Teal</Label>
+                <Label Classes="Solid Green" Theme="{StaticResource TagLabel}">Green</Label>
+                <Label Classes="Solid LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
+                <Label Classes="Solid Lime" Theme="{StaticResource TagLabel}">Lime</Label>
                 <Label Classes="Solid Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
+                <Label Classes="Solid Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                <Label Classes="Solid Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                <Label Classes="Solid Grey" Theme="{StaticResource TagLabel}">Grey</Label>
                 <Label Classes="Solid White" Theme="{StaticResource TagLabel}">White</Label>
             </WrapPanel>
 
@@ -162,7 +162,7 @@
     <!--  Light, Ghost, Solid.  -->
     <!--  Shape: Square,Circle. Default is Square  -->
     <!--  Size: Small, Large. Default is Small  -->
-    <!--  Color: Amber, Blue, Cyan, Green, Grey, Indigo, LightBlue, LightGreen, Lime, Orange, Pink, Purple, Red, Teal, Violet, Yellow, White. Default is Grey  -->
+    <!--  Color: Red, Pink, Purple, Violet, Indigo, Blue, LightBlue, Cyan, Teal, Green, LightGreen, Lime, Yellow, Amber, Orange, Grey, White. Default is Grey  -->
     <ControlTheme x:Key="TagLabel" TargetType="Label">
         <Setter Property="Label.BorderThickness" Value="{DynamicResource LabelTagBorderThickness}" />
         <Setter Property="Label.MinHeight" Value="{DynamicResource LabelTagSmallHeight}" />
@@ -203,45 +203,9 @@
             <Setter Property="Label.BorderBrush" Value="Transparent" />
             <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
             <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
-            <Style Selector="^.Amber">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightAmberBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightAmberForeground}" />
-            </Style>
-            <Style Selector="^.Blue">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightBlueBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightBlueForeground}" />
-            </Style>
-            <Style Selector="^.Cyan">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightCyanBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightCyanForeground}" />
-            </Style>
-            <Style Selector="^.Green">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreenBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreenForeground}" />
-            </Style>
-            <Style Selector="^.Grey">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
-            </Style>
-            <Style Selector="^.Indigo">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightIndigoBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightIndigoForeground}" />
-            </Style>
-            <Style Selector="^.LightBlue">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLightBlueBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLightBlueForeground}" />
-            </Style>
-            <Style Selector="^.LightGreen">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLightGreenBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLightGreenForeground}" />
-            </Style>
-            <Style Selector="^.Lime">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLimeBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLimeForeground}" />
-            </Style>
-            <Style Selector="^.Orange">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightOrangeBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightOrangeForeground}" />
+            <Style Selector="^.Red">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightRedBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightRedForeground}" />
             </Style>
             <Style Selector="^.Pink">
                 <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightPinkBackground}" />
@@ -251,22 +215,58 @@
                 <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightPurpleBackground}" />
                 <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightPurpleForeground}" />
             </Style>
-            <Style Selector="^.Red">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightRedBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightRedForeground}" />
+            <Style Selector="^.Violet">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightVioletBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightVioletForeground}" />
+            </Style>
+            <Style Selector="^.Indigo">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightIndigoBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightIndigoForeground}" />
+            </Style>
+            <Style Selector="^.Blue">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightBlueBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightBlueForeground}" />
+            </Style>
+            <Style Selector="^.LightBlue">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLightBlueBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLightBlueForeground}" />
+            </Style>
+            <Style Selector="^.Cyan">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightCyanBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightCyanForeground}" />
             </Style>
             <Style Selector="^.Teal">
                 <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightTealBackground}" />
                 <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightTealForeground}" />
             </Style>
-            <Style Selector="^.Violet">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightVioletBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightVioletForeground}" />
+            <Style Selector="^.Green">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreenBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreenForeground}" />
+            </Style>
+            <Style Selector="^.LightGreen">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLightGreenBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLightGreenForeground}" />
+            </Style>
+            <Style Selector="^.Lime">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLimeBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLimeForeground}" />
             </Style>
             <Style Selector="^.Yellow">
                 <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightYellowBackground}" />
                 <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightYellowForeground}" />
             </Style>
+            <Style Selector="^.Amber">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightAmberBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightAmberForeground}" />
+            </Style>
+            <Style Selector="^.Orange">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightOrangeBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightOrangeForeground}" />
+            </Style>
+            <Style Selector="^.Grey">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
+            </Style>
             <Style Selector="^.White">
                 <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightWhiteBackground}" />
                 <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightWhiteForeground}" />
@@ -277,45 +277,9 @@
             <Setter Property="Label.Background" Value="Transparent" />
             <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagLightGreyBackground}" />
             <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
-            <Style Selector="^.Amber">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostAmberBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostAmberForeground}" />
-            </Style>
-            <Style Selector="^.Blue">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostBlueBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostBlueForeground}" />
-            </Style>
-            <Style Selector="^.Cyan">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostCyanBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostCyanForeground}" />
-            </Style>
-            <Style Selector="^.Green">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostGreenBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostGreenForeground}" />
-            </Style>
-            <Style Selector="^.Grey">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostGreyBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostGreyForeground}" />
-            </Style>
-            <Style Selector="^.Indigo">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostIndigoBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostIndigoForeground}" />
-            </Style>
-            <Style Selector="^.LightBlue">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLightBlueBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLightBlueForeground}" />
-            </Style>
-            <Style Selector="^.LightGreen">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLightGreenBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLightGreenForeground}" />
-            </Style>
-            <Style Selector="^.Lime">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLimeBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLimeForeground}" />
-            </Style>
-            <Style Selector="^.Orange">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostOrangeBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostOrangeForeground}" />
+            <Style Selector="^.Red">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostRedBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostRedForeground}" />
             </Style>
             <Style Selector="^.Pink">
                 <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostPinkBorderBrush}" />
@@ -325,22 +289,58 @@
                 <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostPurpleBorderBrush}" />
                 <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostPurpleForeground}" />
             </Style>
-            <Style Selector="^.Red">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostRedBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostRedForeground}" />
+            <Style Selector="^.Violet">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostVioletBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostVioletForeground}" />
+            </Style>
+            <Style Selector="^.Indigo">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostIndigoBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostIndigoForeground}" />
+            </Style>
+            <Style Selector="^.Blue">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostBlueBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostBlueForeground}" />
+            </Style>
+            <Style Selector="^.LightBlue">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLightBlueBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLightBlueForeground}" />
+            </Style>
+            <Style Selector="^.Cyan">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostCyanBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostCyanForeground}" />
             </Style>
             <Style Selector="^.Teal">
                 <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostTealBorderBrush}" />
                 <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostTealForeground}" />
             </Style>
-            <Style Selector="^.Violet">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostVioletBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostVioletForeground}" />
+            <Style Selector="^.Green">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostGreenBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostGreenForeground}" />
+            </Style>
+            <Style Selector="^.LightGreen">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLightGreenBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLightGreenForeground}" />
+            </Style>
+            <Style Selector="^.Lime">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLimeBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLimeForeground}" />
             </Style>
             <Style Selector="^.Yellow">
                 <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostYellowBorderBrush}" />
                 <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostYellowForeground}" />
             </Style>
+            <Style Selector="^.Amber">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostAmberBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostAmberForeground}" />
+            </Style>
+            <Style Selector="^.Orange">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostOrangeBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostOrangeForeground}" />
+            </Style>
+            <Style Selector="^.Grey">
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostGreyBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostGreyForeground}" />
+            </Style>
             <Style Selector="^.White">
                 <Setter Property="Label.Background" Value="{DynamicResource LabelTagGhostWhiteBackground}" />
                 <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostWhiteForeground}" />
@@ -351,35 +351,8 @@
             <Setter Property="Label.BorderBrush" Value="Transparent" />
             <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagSolidForeground}" />
             <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
-            <Style Selector="^.Amber">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidAmberBackground}" />
-            </Style>
-            <Style Selector="^.Blue">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidBlueBackground}" />
-            </Style>
-            <Style Selector="^.Cyan">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidCyanBackground}" />
-            </Style>
-            <Style Selector="^.Green">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreenBackground}" />
-            </Style>
-            <Style Selector="^.Grey">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
-            </Style>
-            <Style Selector="^.Indigo">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidIndigoBackground}" />
-            </Style>
-            <Style Selector="^.LightBlue">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLightBlueBackground}" />
-            </Style>
-            <Style Selector="^.LightGreen">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLightGreenBackground}" />
-            </Style>
-            <Style Selector="^.Lime">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLimeBackground}" />
-            </Style>
-            <Style Selector="^.Orange">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidOrangeBackground}" />
+            <Style Selector="^.Red">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidRedBackground}" />
             </Style>
             <Style Selector="^.Pink">
                 <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidPinkBackground}" />
@@ -387,18 +360,45 @@
             <Style Selector="^.Purple">
                 <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidPurpleBackground}" />
             </Style>
-            <Style Selector="^.Red">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidRedBackground}" />
+            <Style Selector="^.Violet">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidVioletBackground}" />
+            </Style>
+            <Style Selector="^.Indigo">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidIndigoBackground}" />
+            </Style>
+            <Style Selector="^.Blue">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidBlueBackground}" />
+            </Style>
+            <Style Selector="^.LightBlue">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLightBlueBackground}" />
+            </Style>
+            <Style Selector="^.Cyan">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidCyanBackground}" />
             </Style>
             <Style Selector="^.Teal">
                 <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidTealBackground}" />
             </Style>
-            <Style Selector="^.Violet">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidVioletBackground}" />
+            <Style Selector="^.Green">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreenBackground}" />
+            </Style>
+            <Style Selector="^.LightGreen">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLightGreenBackground}" />
+            </Style>
+            <Style Selector="^.Lime">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLimeBackground}" />
             </Style>
             <Style Selector="^.Yellow">
                 <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidYellowBackground}" />
             </Style>
+            <Style Selector="^.Amber">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidAmberBackground}" />
+            </Style>
+            <Style Selector="^.Orange">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidOrangeBackground}" />
+            </Style>
+            <Style Selector="^.Grey">
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
+            </Style>
             <Style Selector="^.White">
                 <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagSolidWhiteForeground}" />
                 <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagSolidWhiteBorderBrush}" />
diff --git a/src/Semi.Avalonia/Themes/Dark/Label.axaml b/src/Semi.Avalonia/Themes/Dark/Label.axaml
index a7e2ce0..fb9815d 100644
--- a/src/Semi.Avalonia/Themes/Dark/Label.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Label.axaml
@@ -13,99 +13,99 @@
     <CornerRadius x:Key="LabelTagSquareCornerRadius">3</CornerRadius>
     <CornerRadius x:Key="LabelTagCircleCornerRadius">9999</CornerRadius>
 
-    <SolidColorBrush x:Key="LabelTagLightAmberForeground" Color="#FCF6D2" />
-    <SolidColorBrush x:Key="LabelTagLightAmberBackground" Opacity="0.15" Color="#F5CA50" />
-    <SolidColorBrush x:Key="LabelTagLightBlueForeground" Color="#D4ECFF" />
-    <SolidColorBrush x:Key="LabelTagLightBlueBackground" Opacity="0.15" Color="#54A9FF" />
-    <SolidColorBrush x:Key="LabelTagLightCyanForeground" Color="#C6EFF1" />
-    <SolidColorBrush x:Key="LabelTagLightCyanBackground" Opacity="0.15" Color="#38BBC6" />
-    <SolidColorBrush x:Key="LabelTagLightGreenForeground" Color="#D0F0D1" />
-    <SolidColorBrush x:Key="LabelTagLightGreenBackground" Opacity="0.15" Color="#5DC264" />
-    <SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="#888D92" />
-    <SolidColorBrush x:Key="LabelTagLightIndigoForeground" Color="#D1D8F1" />
-    <SolidColorBrush x:Key="LabelTagLightIndigoBackground" Opacity="0.15" Color="#5F71C5" />
-    <SolidColorBrush x:Key="LabelTagLightLightBlueForeground" Color="#CEEEFC" />
-    <SolidColorBrush x:Key="LabelTagLightLightBlueBackground" Opacity="0.15" Color="#40B4F3" />
-    <SolidColorBrush x:Key="LabelTagLightLightGreenForeground" Color="#E4F1D1" />
-    <SolidColorBrush x:Key="LabelTagLightLightGreenBackground" Opacity="0.15" Color="#97C65F" />
-    <SolidColorBrush x:Key="LabelTagLightLimeForeground" Color="#E5F6C9" />
-    <SolidColorBrush x:Key="LabelTagLightLimeBackground" Opacity="0.15" Color="#AEDC3A" />
-    <SolidColorBrush x:Key="LabelTagLightOrangeForeground" Color="#FFEFD0" />
-    <SolidColorBrush x:Key="LabelTagLightOrangeBackground" Opacity="0.15" Color="#FFAE43" />
+    <SolidColorBrush x:Key="LabelTagLightRedForeground" Color="#FEE0D5" />
+    <SolidColorBrush x:Key="LabelTagLightRedBackground" Opacity="0.15" Color="#FC725A" />
     <SolidColorBrush x:Key="LabelTagLightPinkForeground" Color="#FBD3DC" />
     <SolidColorBrush x:Key="LabelTagLightPinkBackground" Opacity="0.15" Color="#EF5686" />
     <SolidColorBrush x:Key="LabelTagLightPurpleForeground" Color="#EFCEF0" />
     <SolidColorBrush x:Key="LabelTagLightPurpleBackground" Opacity="0.15" Color="#B553C2" />
-    <SolidColorBrush x:Key="LabelTagLightRedForeground" Color="#FEE0D5" />
-    <SolidColorBrush x:Key="LabelTagLightRedBackground" Opacity="0.15" Color="#FC725A" />
-    <SolidColorBrush x:Key="LabelTagLightTealForeground" Color="#C4F0E8" />
-    <SolidColorBrush x:Key="LabelTagLightTealBackground" Opacity="0.15" Color="#33C2B0" />
     <SolidColorBrush x:Key="LabelTagLightVioletForeground" Color="#DDD4F4" />
     <SolidColorBrush x:Key="LabelTagLightVioletBackground" Opacity="0.15" Color="#8865D4" />
+    <SolidColorBrush x:Key="LabelTagLightIndigoForeground" Color="#D1D8F1" />
+    <SolidColorBrush x:Key="LabelTagLightIndigoBackground" Opacity="0.15" Color="#5F71C5" />
+    <SolidColorBrush x:Key="LabelTagLightBlueForeground" Color="#D4ECFF" />
+    <SolidColorBrush x:Key="LabelTagLightBlueBackground" Opacity="0.15" Color="#54A9FF" />
+    <SolidColorBrush x:Key="LabelTagLightLightBlueForeground" Color="#CEEEFC" />
+    <SolidColorBrush x:Key="LabelTagLightLightBlueBackground" Opacity="0.15" Color="#40B4F3" />
+    <SolidColorBrush x:Key="LabelTagLightCyanForeground" Color="#C6EFF1" />
+    <SolidColorBrush x:Key="LabelTagLightCyanBackground" Opacity="0.15" Color="#38BBC6" />
+    <SolidColorBrush x:Key="LabelTagLightTealForeground" Color="#C4F0E8" />
+    <SolidColorBrush x:Key="LabelTagLightTealBackground" Opacity="0.15" Color="#33C2B0" />
+    <SolidColorBrush x:Key="LabelTagLightGreenForeground" Color="#D0F0D1" />
+    <SolidColorBrush x:Key="LabelTagLightGreenBackground" Opacity="0.15" Color="#5DC264" />
+    <SolidColorBrush x:Key="LabelTagLightLightGreenForeground" Color="#E4F1D1" />
+    <SolidColorBrush x:Key="LabelTagLightLightGreenBackground" Opacity="0.15" Color="#97C65F" />
+    <SolidColorBrush x:Key="LabelTagLightLimeForeground" Color="#E5F6C9" />
+    <SolidColorBrush x:Key="LabelTagLightLimeBackground" Opacity="0.15" Color="#AEDC3A" />
     <SolidColorBrush x:Key="LabelTagLightYellowForeground" Color="#FEFBD0" />
     <SolidColorBrush x:Key="LabelTagLightYellowBackground" Opacity="0.15" Color="#FDDE43" />
+    <SolidColorBrush x:Key="LabelTagLightAmberForeground" Color="#FCF6D2" />
+    <SolidColorBrush x:Key="LabelTagLightAmberBackground" Opacity="0.15" Color="#F5CA50" />
+    <SolidColorBrush x:Key="LabelTagLightOrangeForeground" Color="#FFEFD0" />
+    <SolidColorBrush x:Key="LabelTagLightOrangeBackground" Opacity="0.15" Color="#FFAE43" />
+    <SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="#888D92" />
     <SolidColorBrush x:Key="LabelTagLightWhiteBackground" Color="#4F5159" />
     <SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Color="#41464C" />
     <SolidColorBrush x:Key="LabelTagLightWhiteForeground" Color="#F9F9F9" />
 
-    <SolidColorBrush x:Key="LabelTagGhostAmberBorderBrush" Color="#F2B726" />
-    <SolidColorBrush x:Key="LabelTagGhostAmberForeground" Color="#F5CA50" />
-    <SolidColorBrush x:Key="LabelTagGhostBlueBorderBrush" Color="#2990FF" />
-    <SolidColorBrush x:Key="LabelTagGhostBlueForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="LabelTagGhostCyanBorderBrush" Color="#13A8B8" />
-    <SolidColorBrush x:Key="LabelTagGhostCyanForeground" Color="#38BBC6" />
-    <SolidColorBrush x:Key="LabelTagGhostGreenBorderBrush" Color="#3EB349" />
-    <SolidColorBrush x:Key="LabelTagGhostGreenForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="LabelTagGhostGreyBorderBrush" Color="#6B7075" />
-    <SolidColorBrush x:Key="LabelTagGhostGreyForeground" Color="#888D92" />
-    <SolidColorBrush x:Key="LabelTagGhostIndigoBorderBrush" Color="#4053B7" />
-    <SolidColorBrush x:Key="LabelTagGhostIndigoForeground" Color="#5F71C5" />
-    <SolidColorBrush x:Key="LabelTagGhostLightBlueBorderBrush" Color="#139FF0" />
-    <SolidColorBrush x:Key="LabelTagGhostLightBlueForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="LabelTagGhostLightGreenBorderBrush" Color="#7FB840" />
-    <SolidColorBrush x:Key="LabelTagGhostLightGreenForeground" Color="#97C65F" />
-    <SolidColorBrush x:Key="LabelTagGhostLimeBorderBrush" Color="#A2D311" />
-    <SolidColorBrush x:Key="LabelTagGhostLimeForeground" Color="#AEDC3A" />
-    <SolidColorBrush x:Key="LabelTagGhostOrangeBorderBrush" Color="#FF9214" />
-    <SolidColorBrush x:Key="LabelTagGhostOrangeForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="LabelTagGhostRedBorderBrush" Color="#FB4932" />
+    <SolidColorBrush x:Key="LabelTagGhostRedForeground" Color="#FC725A" />
     <SolidColorBrush x:Key="LabelTagGhostPinkBorderBrush" Color="#EB2F71" />
     <SolidColorBrush x:Key="LabelTagGhostPinkForeground" Color="#EF5686" />
     <SolidColorBrush x:Key="LabelTagGhostPurpleBorderBrush" Color="#A033B3" />
     <SolidColorBrush x:Key="LabelTagGhostPurpleForeground" Color="#B553C2" />
-    <SolidColorBrush x:Key="LabelTagGhostRedBorderBrush" Color="#FB4932" />
-    <SolidColorBrush x:Key="LabelTagGhostRedForeground" Color="#FC725A" />
-    <SolidColorBrush x:Key="LabelTagGhostTealBorderBrush" Color="#0EB3A1" />
-    <SolidColorBrush x:Key="LabelTagGhostTealForeground" Color="#33C2B0" />
     <SolidColorBrush x:Key="LabelTagGhostVioletBorderBrush" Color="#7246C9" />
     <SolidColorBrush x:Key="LabelTagGhostVioletForeground" Color="#8865D4" />
+    <SolidColorBrush x:Key="LabelTagGhostIndigoBorderBrush" Color="#4053B7" />
+    <SolidColorBrush x:Key="LabelTagGhostIndigoForeground" Color="#5F71C5" />
+    <SolidColorBrush x:Key="LabelTagGhostBlueBorderBrush" Color="#2990FF" />
+    <SolidColorBrush x:Key="LabelTagGhostBlueForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="LabelTagGhostLightBlueBorderBrush" Color="#139FF0" />
+    <SolidColorBrush x:Key="LabelTagGhostLightBlueForeground" Color="#40B4F3" />
+    <SolidColorBrush x:Key="LabelTagGhostCyanBorderBrush" Color="#13A8B8" />
+    <SolidColorBrush x:Key="LabelTagGhostCyanForeground" Color="#38BBC6" />
+    <SolidColorBrush x:Key="LabelTagGhostTealBorderBrush" Color="#0EB3A1" />
+    <SolidColorBrush x:Key="LabelTagGhostTealForeground" Color="#33C2B0" />
+    <SolidColorBrush x:Key="LabelTagGhostGreenBorderBrush" Color="#3EB349" />
+    <SolidColorBrush x:Key="LabelTagGhostGreenForeground" Color="#5DC264" />
+    <SolidColorBrush x:Key="LabelTagGhostLightGreenBorderBrush" Color="#7FB840" />
+    <SolidColorBrush x:Key="LabelTagGhostLightGreenForeground" Color="#97C65F" />
+    <SolidColorBrush x:Key="LabelTagGhostLimeBorderBrush" Color="#A2D311" />
+    <SolidColorBrush x:Key="LabelTagGhostLimeForeground" Color="#AEDC3A" />
     <SolidColorBrush x:Key="LabelTagGhostYellowBorderBrush" Color="#FCCE14" />
     <SolidColorBrush x:Key="LabelTagGhostYellowForeground" Color="#FDDE43" />
+    <SolidColorBrush x:Key="LabelTagGhostAmberBorderBrush" Color="#F2B726" />
+    <SolidColorBrush x:Key="LabelTagGhostAmberForeground" Color="#F5CA50" />
+    <SolidColorBrush x:Key="LabelTagGhostOrangeBorderBrush" Color="#FF9214" />
+    <SolidColorBrush x:Key="LabelTagGhostOrangeForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="LabelTagGhostGreyBorderBrush" Color="#6B7075" />
+    <SolidColorBrush x:Key="LabelTagGhostGreyForeground" Color="#888D92" />
     <SolidColorBrush x:Key="LabelTagGhostWhiteBackground" Color="#4F5159" />
     <SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Color="#41464C" />
     <SolidColorBrush x:Key="LabelTagGhostWhiteForeground" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="LabelTagSolidForeground" Color="White" />
-    <SolidColorBrush x:Key="LabelTagSolidAmberBackground" Color="#F5CA50" />
-    <SolidColorBrush x:Key="LabelTagSolidBlueBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="LabelTagSolidCyanBackground" Color="#38BBC6" />
-    <SolidColorBrush x:Key="LabelTagSolidGreenBackground" Color="#5DC264" />
-    <SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="#888D92" />
-    <SolidColorBrush x:Key="LabelTagSolidIndigoBackground" Color="#5F71C5" />
-    <SolidColorBrush x:Key="LabelTagSolidLightBlueBackground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="LabelTagSolidLightGreenBackground" Color="#97C65F" />
-    <SolidColorBrush x:Key="LabelTagSolidLimeBackground" Color="#AEDC3A" />
-    <SolidColorBrush x:Key="LabelTagSolidOrangeBackground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="LabelTagSolidRedBackground" Color="#FC725A" />
     <SolidColorBrush x:Key="LabelTagSolidPinkBackground" Color="#EF5686" />
     <SolidColorBrush x:Key="LabelTagSolidPurpleBackground" Color="#B553C2" />
-    <SolidColorBrush x:Key="LabelTagSolidRedBackground" Color="#FC725A" />
-    <SolidColorBrush x:Key="LabelTagSolidTealBackground" Color="#33C2B0" />
     <SolidColorBrush x:Key="LabelTagSolidVioletBackground" Color="#8865D4" />
+    <SolidColorBrush x:Key="LabelTagSolidIndigoBackground" Color="#5F71C5" />
+    <SolidColorBrush x:Key="LabelTagSolidBlueBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="LabelTagSolidLightBlueBackground" Color="#40B4F3" />
+    <SolidColorBrush x:Key="LabelTagSolidCyanBackground" Color="#38BBC6" />
+    <SolidColorBrush x:Key="LabelTagSolidTealBackground" Color="#33C2B0" />
+    <SolidColorBrush x:Key="LabelTagSolidGreenBackground" Color="#5DC264" />
+    <SolidColorBrush x:Key="LabelTagSolidLightGreenBackground" Color="#97C65F" />
+    <SolidColorBrush x:Key="LabelTagSolidLimeBackground" Color="#AEDC3A" />
     <SolidColorBrush x:Key="LabelTagSolidYellowBackground" Color="#FDDE43" />
+    <SolidColorBrush x:Key="LabelTagSolidAmberBackground" Color="#F5CA50" />
+    <SolidColorBrush x:Key="LabelTagSolidOrangeBackground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="#888D92" />
 
     <SolidColorBrush x:Key="LabelTagSolidWhiteBackground" Color="#4F5159" />
     <SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="#41464C" />
     <SolidColorBrush x:Key="LabelTagSolidWhiteForeground" Color="#F9F9F9" />
 
 
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file

From ad3aac59784bc93c51b4201f075431de1ac15a47 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 11 Jul 2023 17:40:57 +0800
Subject: [PATCH 2/2] feat: add color block into ScrollViewerDemo.

---
 .../Pages/ScrollViewerDemo.axaml              | 90 ++++++++++++++-----
 1 file changed, 66 insertions(+), 24 deletions(-)

diff --git a/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml
index 00dfd4a..fbacaff 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml
@@ -7,27 +7,69 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <StackPanel>
-        <ScrollViewer
-            Width="200"
-            Height="200"
-            Margin="10"
-            HorizontalScrollBarVisibility="Auto">
-            <Rectangle
-                Width="300"
-                Height="300"
-                Fill="{DynamicResource SemiYellow2}" />
-        </ScrollViewer>
-        <ScrollViewer
-            Width="200"
-            Height="200"
-            Margin="10"
-            HorizontalScrollBarVisibility="Auto"
-            Theme="{DynamicResource StaticScrollViewer}">
-            <Rectangle
-                Width="300"
-                Height="300"
-                Fill="{DynamicResource SemiYellow2}" />
-        </ScrollViewer>
-    </StackPanel>
-</UserControl>
+    <ScrollViewer>
+        <StackPanel HorizontalAlignment="Left" Spacing="20">
+            <ScrollViewer
+                Width="200"
+                Height="200"
+                Margin="10"
+                HorizontalScrollBarVisibility="Auto">
+                <Grid RowDefinitions="Auto,Auto"
+                      ColumnDefinitions="Auto,Auto"
+                      Width="300" Height="300">
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiYellow2}" />
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiBlue2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiPink2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiGreen2}" />
+                </Grid>
+            </ScrollViewer>
+            <ScrollViewer
+                Width="200"
+                Height="200"
+                Margin="10"
+                HorizontalScrollBarVisibility="Auto"
+                Theme="{DynamicResource StaticScrollViewer}">
+                <Grid RowDefinitions="Auto,Auto"
+                      ColumnDefinitions="Auto,Auto"
+                      Width="300" Height="300">
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiYellow2}" />
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiBlue2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiPink2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiGreen2}" />
+                </Grid>
+            </ScrollViewer>
+        </StackPanel>
+    </ScrollViewer>
+</UserControl>
\ No newline at end of file