From 7ff0e63e4d4efb85f2512c8cd6e4dca755723831 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 16 Jan 2025 15:44:12 +0800
Subject: [PATCH] fix: fix Badge Light Classes colors.

---
 src/Ursa.Themes.Semi/Controls/Badge.axaml     | 15 +++---
 src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml  | 48 +++++++++----------
 src/Ursa.Themes.Semi/Themes/Light/Badge.axaml | 24 +++++-----
 .../Themes/Shared/Badge.axaml                 |  2 +-
 4 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Badge.axaml b/src/Ursa.Themes.Semi/Controls/Badge.axaml
index adac623..11cd4c5 100644
--- a/src/Ursa.Themes.Semi/Controls/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Badge.axaml
@@ -22,6 +22,9 @@
             <u:Badge Header="NEW">
                 <u:Avatar Classes="Square LightBlue" Content="WF" />
             </u:Badge>
+            <u:Badge Classes="Light" Header="Pyro" CornerPosition="BottomLeft">
+                <u:Avatar Classes="Red" Content="火" />
+            </u:Badge>
         </StackPanel>
     </Design.PreviewWith>
 
@@ -42,7 +45,7 @@
         <Setter Property="CornerPosition" Value="{DynamicResource BadgeCornerPosition}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="{x:Type u:Badge}">
-                <Grid
+                <Panel
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
                     ClipToBounds="False">
@@ -59,8 +62,6 @@
                         MinWidth="{DynamicResource BadgeMinWidth}"
                         MinHeight="{DynamicResource BadgeMinHeight}"
                         Padding="{DynamicResource BadgePadding}"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
@@ -85,14 +86,14 @@
                             </ContentPresenter.Content>
                         </ContentPresenter>
                     </Border>
-                </Grid>
+                </Panel>
             </ControlTemplate>
         </Setter>
 
         <Style Selector="^[Dot=True]">
             <Setter Property="Template">
                 <ControlTemplate TargetType="{x:Type u:Badge}">
-                    <Grid
+                    <Panel
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                         VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         ClipToBounds="False">
@@ -108,14 +109,12 @@
                             Name="{x:Static u:Badge.PART_BadgeContainer}"
                             Width="{DynamicResource BadgeDotWidth}"
                             Height="{DynamicResource BadgeDotHeight}"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Top"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}"
                             RenderTransformOrigin=".5,.5" />
-                    </Grid>
+                    </Panel>
                 </ControlTemplate>
             </Setter>
         </Style>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
index 37c6584..5c2b5e9 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
@@ -3,32 +3,32 @@
     <SolidColorBrush x:Key="BadgeForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="BadgeContentForeground" Color="White" />
     <!-- Solid -->
-    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="BadgeSecondaryBadgeBackground" Color="#FF40B4F3" />
-    <SolidColorBrush x:Key="BadgeTertiaryBadgeBackground" Color="#FF888D92" />
-    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#FF5DC264" />
-    <SolidColorBrush x:Key="BadgeWarningBadgeBackground" Color="#FFFFAE43" />
-    <SolidColorBrush x:Key="BadgeDangerBadgeBackground" Color="#FFFC725A" />
+    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="BadgeSecondaryBadgeBackground" Color="#40B4F3" />
+    <SolidColorBrush x:Key="BadgeTertiaryBadgeBackground" Color="#888D92" />
+    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#5DC264" />
+    <SolidColorBrush x:Key="BadgeWarningBadgeBackground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="BadgeDangerBadgeBackground" Color="#FC725A" />
     <!-- Light -->
-    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#FF003D8F" />
-    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeForeground" Color="#FF40B4F3" />
-    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeBackground" Color="#FF004B83" />
-    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeForeground" Color="#FF888D92" />
-    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeBackground" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeForeground" Color="#FF5DC264" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#FF1B5924" />
-    <SolidColorBrush x:Key="BadgeLightWarningBadgeForeground" Color="#FFFFAE43" />
-    <SolidColorBrush x:Key="BadgeLightWarningBadgeBackground" Color="#FF7E3100" />
-    <SolidColorBrush x:Key="BadgeLightDangerBadgeForeground" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="BadgeLightDangerBadgeBackground" Color="#FF8E0805" />
+    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#053170" />
+    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeForeground" Color="#40B4F3" />
+    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeBackground" Color="#003761" />
+    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeForeground" Color="#888D92" />
+    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeBackground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="BadgeLightSuccessBadgeForeground" Color="#5DC264" />
+    <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#123C19" />
+    <SolidColorBrush x:Key="BadgeLightWarningBadgeForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="BadgeLightWarningBadgeBackground" Color="#551F03" />
+    <SolidColorBrush x:Key="BadgeLightDangerBadgeForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="BadgeLightDangerBadgeBackground" Color="#6C090B" />
     <!-- Inverted -->
     <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="BadgeInvertedSecondaryBadgeForeground" Color="#FF40B4F3" />
-    <SolidColorBrush x:Key="BadgeInvertedTertiaryBadgeForeground" Color="#FF888D92" />
-    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#FF5DC264" />
-    <SolidColorBrush x:Key="BadgeInvertedWarningBadgeForeground" Color="#FFFFAE43" />
-    <SolidColorBrush x:Key="BadgeInvertedDangerBadgeForeground" Color="#FFFC725A" />
+    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="BadgeInvertedSecondaryBadgeForeground" Color="#40B4F3" />
+    <SolidColorBrush x:Key="BadgeInvertedTertiaryBadgeForeground" Color="#888D92" />
+    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#5DC264" />
+    <SolidColorBrush x:Key="BadgeInvertedWarningBadgeForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="BadgeInvertedDangerBadgeForeground" Color="#FC725A" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml b/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml
index 403f137..ff148f7 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml
@@ -3,32 +3,32 @@
     <SolidColorBrush x:Key="BadgeForeground" Color="White" />
     <SolidColorBrush x:Key="BadgeContentForeground" Color="#1C1F23" />
     <!-- Solid -->
-    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="#0077F0" />
+    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="#0077FA" />
     <SolidColorBrush x:Key="BadgeSecondaryBadgeBackground" Color="#0095EE" />
     <SolidColorBrush x:Key="BadgeTertiaryBadgeBackground" Color="#6B7075" />
+    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#3BB346" />
     <SolidColorBrush x:Key="BadgeWarningBadgeBackground" Color="#FC8800" />
     <SolidColorBrush x:Key="BadgeDangerBadgeBackground" Color="#F93920" />
-    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#3BB346" />
     <!-- Light -->
     <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#D4ECFF" />
+    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="BadgeLightSecondaryBadgeForeground" Color="#0095EE" />
-    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeBackground" Color="#CEEEFC" />
+    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeBackground" Color="#E9F7FD" />
     <SolidColorBrush x:Key="BadgeLightTertiaryBadgeForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeBackground" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="BadgeLightWarningBadgeForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="BadgeLightWarningBadgeBackground" Color="#FFEFD0" />
-    <SolidColorBrush x:Key="BadgeLightDangerBadgeForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="BadgeLightDangerBadgeBackground" Color="#FEE0D5" />
+    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeBackground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="BadgeLightSuccessBadgeForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#D0F0D1" />
+    <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#ECF7EC" />
+    <SolidColorBrush x:Key="BadgeLightWarningBadgeForeground" Color="#FC8800" />
+    <SolidColorBrush x:Key="BadgeLightWarningBadgeBackground" Color="#FFF8EA" />
+    <SolidColorBrush x:Key="BadgeLightDangerBadgeForeground" Color="#F93920" />
+    <SolidColorBrush x:Key="BadgeLightDangerBadgeBackground" Color="#FEF2ED" />
     <!-- Inverted -->
     <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="White" />
 
-    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="#0077F0" />
+    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="#0077FA" />
     <SolidColorBrush x:Key="BadgeInvertedSecondaryBadgeForeground" Color="#0095EE" />
     <SolidColorBrush x:Key="BadgeInvertedTertiaryBadgeForeground" Color="#6B7075" />
+    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#3BB346" />
     <SolidColorBrush x:Key="BadgeInvertedWarningBadgeForeground" Color="#FC8800" />
     <SolidColorBrush x:Key="BadgeInvertedDangerBadgeForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#3BB346" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/Badge.axaml b/src/Ursa.Themes.Semi/Themes/Shared/Badge.axaml
index 9f1dd5d..b69c74a 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/Badge.axaml
@@ -8,7 +8,7 @@
     <x:Double x:Key="BadgeDotHeight">8</x:Double>
     <Thickness x:Key="BadgePadding">4,0</Thickness>
     <Thickness x:Key="BadgeBorderThickness">1</Thickness>
-    <x:Double x:Key="BadgeFontSize">10</x:Double>
+    <x:Double x:Key="BadgeFontSize">12</x:Double>
     <CornerRadius x:Key="BadgeCornerRadius">100</CornerRadius>
     <common:CornerPosition x:Key="BadgeCornerPosition">TopRight</common:CornerPosition>
 </ResourceDictionary>
\ No newline at end of file