From 905e0f6fc250cb7e46d3b411acb18a46a03669b9 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Fri, 21 Jul 2023 02:21:28 +0800 Subject: [PATCH] feat: add Light and Inverted classes. --- demo/Ursa.Demo/Pages/BadgeDemo.axaml | 379 ++++++++++++------ src/Ursa.Themes.Semi/Controls/Badge.axaml | 54 ++- src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml | 28 +- src/Ursa.Themes.Semi/Themes/Light/Badge.axaml | 26 +- 4 files changed, 350 insertions(+), 137 deletions(-) diff --git a/demo/Ursa.Demo/Pages/BadgeDemo.axaml b/demo/Ursa.Demo/Pages/BadgeDemo.axaml index c8a3b0e..ce4e062 100644 --- a/demo/Ursa.Demo/Pages/BadgeDemo.axaml +++ b/demo/Ursa.Demo/Pages/BadgeDemo.axaml @@ -8,135 +8,254 @@ d:DesignHeight="450" d:DesignWidth="800" mc:Ignorable="d"> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Controls/Badge.axaml b/src/Ursa.Themes.Semi/Controls/Badge.axaml index e1d5f25..2dc94dd 100644 --- a/src/Ursa.Themes.Semi/Controls/Badge.axaml +++ b/src/Ursa.Themes.Semi/Controls/Badge.axaml @@ -11,6 +11,7 @@ + @@ -18,6 +19,7 @@ + + TextElement.Foreground="{TemplateBinding Foreground}"> @@ -133,5 +135,53 @@ + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml index 9fb3409..b65dbc0 100644 --- a/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml +++ b/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml @@ -1,11 +1,33 @@ - - + + - + + + + + + + + + + + + + + + + + + + + + + + \ 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 ca87cd5..3a326b4 100644 --- a/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml +++ b/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml @@ -1,11 +1,33 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file