From 57ea6bb34e1ea74073651e64f1d783274e641b8c Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Mon, 5 Feb 2024 22:03:08 +0800
Subject: [PATCH] minor style

---
 .../Snap.Hutao/Control/Theme/Card.xaml        | 16 +++++++-------
 src/Snap.Hutao/Snap.Hutao/View/MainView.xaml  |  2 +-
 .../Snap.Hutao/View/Page/WikiWeaponPage.xaml  | 22 +++++++++++--------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
index e60eabd5..91793685 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Card.xaml
@@ -26,14 +26,6 @@
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
     </Style>
 
-    <Style
-        x:Key="AcrylicSecondaryBorderCardStyle"
-        BasedOn="{StaticResource BorderCardStyle}"
-        TargetType="Border">
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Background" Value="{ThemeResource SystemControlChromeMediumAcrylicElementMediumBrush}"/>
-    </Style>
-
     <Style
         x:Key="AcrylicBorderCardStyle"
         BasedOn="{StaticResource BorderCardStyle}"
@@ -42,6 +34,14 @@
         <Setter Property="Background" Value="{ThemeResource SystemControlAcrylicElementBrush}"/>
     </Style>
 
+    <Style
+        x:Key="AcrylicSecondaryBorderCardStyle"
+        BasedOn="{StaticResource BorderCardStyle}"
+        TargetType="Border">
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Background" Value="{ThemeResource SystemControlChromeMediumAcrylicElementMediumBrush}"/>
+    </Style>
+
     <Style x:Key="GridCardStyle" TargetType="Grid">
         <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
         <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
index c2f38350..5f805db4 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml
@@ -18,7 +18,7 @@
     </UserControl.Resources>
     <Grid Transitions="{ThemeResource EntranceThemeTransitions}">
         <Image
-            Opacity="0.45"
+            Opacity="0.65"
             Source="ms-appx:///Resource/TestBackground.jpg"
             Stretch="UniformToFill"/>
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index c6e44895..cef3bfa2 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -75,7 +75,7 @@
         </DataTemplate>
 
         <DataTemplate x:Key="AffixPivotItemTemplate">
-            <shct:DescriptionTextBlock Margin="16,16,0,0" Description="{Binding Description}">
+            <shct:DescriptionTextBlock Margin="16,8,0,0" Description="{Binding Description}">
                 <shct:DescriptionTextBlock.Resources>
                     <Style BasedOn="{StaticResource BodyTextBlockStyle}" TargetType="TextBlock">
                         <Setter Property="TextWrapping" Value="Wrap"/>
@@ -238,6 +238,7 @@
                                                 HorizontalContentAlignment="Stretch"
                                                 BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"/>
 
+
                                             <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
                                                 <StackPanel Spacing="16">
                                                     <TextBlock
@@ -257,14 +258,17 @@
                                                 </StackPanel>
                                             </Border>
 
-                                            <StackPanel Visibility="{Binding Selected.Affix, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
-                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Selected.Affix.Name}"/>
-                                                <Pivot
-                                                    Margin="-16,0,0,0"
-                                                    HeaderTemplate="{StaticResource AffixPivotHeaderTemplate}"
-                                                    ItemTemplate="{StaticResource AffixPivotItemTemplate}"
-                                                    ItemsSource="{Binding Selected.Affix.Descriptions}"/>
-                                            </StackPanel>
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <StackPanel Spacing="16" Visibility="{Binding Selected.Affix, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
+                                                    <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Selected.Affix.Name}"/>
+                                                    <Pivot
+                                                        Margin="-16,-16,0,0"
+                                                        HeaderTemplate="{StaticResource AffixPivotHeaderTemplate}"
+                                                        ItemTemplate="{StaticResource AffixPivotItemTemplate}"
+                                                        ItemsSource="{Binding Selected.Affix.Descriptions}"/>
+                                                </StackPanel>
+                                            </Border>
+
 
                                             <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
                                                 <StackPanel Spacing="16">