better description brush and minor reorder

0x7c13 · Nov 23, 2023 · d9ce397 · d9ce397
1 parent db4d3a1
commit d9ce397
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/src/Notepads/Resource/CustomSettingsStyle.xaml b/src/Notepads/Resource/CustomSettingsStyle.xaml
@@ -19,7 +19,7 @@
     </Style>
 
     <Style x:Key="DescriptionTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}">
-        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+        <Setter Property="Foreground" Value="{ThemeResource SystemControlDescriptionTextForegroundBrush}" />
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Notepads/Views/Settings/AboutPage.xaml b/src/Notepads/Views/Settings/AboutPage.xaml
@@ -24,20 +24,19 @@
             UseSystemFocusVisuals="False"
             VerticalScrollBarVisibility="Auto"
             VerticalScrollMode="Auto">
-            <StackPanel HorizontalAlignment="Left" Margin="{StaticResource SettingsPageFooterMargin}">
+            <StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
 
                 <!--  About  -->
-                <StackPanel Orientation="Horizontal" Spacing="12" Style="{StaticResource SettingsSectionStyle}">
-                    <Image x:Name="AppIconImage" Width="90" Margin="-6,0,0,0" Source="/Assets/appicon_ws.png" />
+                <StackPanel Orientation="Horizontal" Style="{StaticResource SettingsSectionStyle}">
+                    <Image x:Name="AppIconImage" Width="90" Margin="-6,0,12,0" Source="/Assets/appicon_ws.png" />
                     <StackPanel>
                         <TextBlock
-                            Margin="0,4,0,0"
+                            Margin="0,4"
                             FontWeight="Normal"
                             Style="{StaticResource TitleTextBlockStyle}"
                             Text="{x:Bind AppName, Mode=OneTime}" />
                         <TextBlock
-                            Margin="2,4,0,0"
-                            Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
+                            Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}"
                             Style="{StaticResource SubtitleTextBlockStyle}"
                             Text="{x:Bind AppVersion, Mode=OneTime}" />
                     </StackPanel>

diff --git a/src/Notepads/Views/Settings/AdvancedSettingsPage.xaml b/src/Notepads/Views/Settings/AdvancedSettingsPage.xaml
@@ -25,7 +25,7 @@
             UseSystemFocusVisuals="False"
             VerticalScrollBarVisibility="Auto"
             VerticalScrollMode="Auto">
-            <StackPanel HorizontalAlignment="Left" Margin="{StaticResource SettingsPageFooterMargin}">
+            <StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
 
                 <!--  Status Bar  -->
                 <StackPanel x:Name="StatusBarSettingsPanel" Style="{StaticResource SettingsSectionStyle}">

diff --git a/src/Notepads/Views/Settings/PersonalizationSettingsPage.xaml b/src/Notepads/Views/Settings/PersonalizationSettingsPage.xaml
@@ -24,7 +24,7 @@
             UseSystemFocusVisuals="False"
             VerticalScrollBarVisibility="Auto"
             VerticalScrollMode="Auto">
-            <StackPanel HorizontalAlignment="Left" Margin="{StaticResource SettingsPageFooterMargin}">
+            <StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
 
                 <!--  Theme  -->
                 <StackPanel x:Name="ThemeModeSettingsPanel" Style="{StaticResource SettingsSectionStyle}">

diff --git a/src/Notepads/Views/Settings/TextAndEditorSettingsPage.xaml b/src/Notepads/Views/Settings/TextAndEditorSettingsPage.xaml
@@ -25,7 +25,7 @@
             UseSystemFocusVisuals="False"
             VerticalScrollBarVisibility="Auto"
             VerticalScrollMode="Auto">
-            <StackPanel HorizontalAlignment="Left" Margin="{StaticResource SettingsPageFooterMargin}">
+            <StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
 
                 <!--  Text Wrapping  -->
                 <StackPanel x:Name="TextWrappingSettingsPanel" Style="{StaticResource SettingsSectionStyle}">