From 33761cf80c2180bf7c7b46c205b64b0fde6d11ae Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Fri, 28 Jul 2023 00:55:18 +0800 Subject: [PATCH] feat: use Classes instead of Themes. --- demo/Ursa.Demo/Pages/DualBadgeDemo.axaml | 223 ++++++++++-------- src/Ursa.Themes.Semi/Controls/DualBadge.axaml | 38 ++- .../Themes/Dark/DualBadge.axaml | 10 +- .../Themes/Light/DualBadge.axaml | 11 +- 4 files changed, 164 insertions(+), 118 deletions(-) diff --git a/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml b/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml index c3fb94d..83e4098 100644 --- a/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml +++ b/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml @@ -8,101 +8,140 @@ d:DesignHeight="450" d:DesignWidth="800" mc:Ignorable="d"> - - - 2.4k - - - - - - 2.4k - + + + - - 2.4k - + + + + + + 2.4k + + + + + + 2.4k + + + 2.4k + + + + + + 2.4k + + - - - - - 2.4k - + + + + 2.4k + + + + + + 2.4k + + + 2.4k + + + + + + 2.4k + + - - - - 2.4K - - - - - - - 2.4K - - - - 2.4K - - - - - - - 2.4K - - + + + + 2.4K + + + + + + 2.4K + + + 2.4K + + + + + + 2.4K + + + + \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml index af0c658..e0a040f 100644 --- a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml +++ b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml @@ -59,31 +59,23 @@ + + + + + + - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml index 48bba04..72e804c 100644 --- a/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml +++ b/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml @@ -1,13 +1,21 @@  White White + White - White + + + + + + + + \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml b/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml index 6249aa8..72e804c 100644 --- a/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml +++ b/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml @@ -1,14 +1,21 @@  White White + White - White - + + + + + + + + \ No newline at end of file