improve brushes and more resources

0x7c13 · Apr 23, 2024 · bfd3e6a · bfd3e6a
1 parent 5cad0a6
commit bfd3e6a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/src/Notepads/Resource/CustomSettingsStyle.xaml b/src/Notepads/Resource/CustomSettingsStyle.xaml
@@ -12,12 +12,13 @@
             <SolidColorBrush x:Key="DangerTextForegroundBrush" Color="{StaticResource DangerTextForegroundColor}" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush x:Key="DangerTextForegroundBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
+            <SolidColorBrush x:Key="DangerTextForegroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
     <StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlTransparentBrush" />
 
+    <x:Double x:Key="SettingsEntranceHorizontalOffset">25</x:Double>
     <Thickness x:Key="SettingsContentPadding">20,8,20,12</Thickness>
     <Thickness x:Key="SettingsTitleMargin">20,0,20,0</Thickness>
     <Thickness x:Key="SettingsSubtitleMargin">0,0,0,6</Thickness>

diff --git a/src/Notepads/Views/Settings/AboutPage.xaml b/src/Notepads/Views/Settings/AboutPage.xaml
@@ -3,15 +3,15 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      d:DesignHeight="1120"
       d:DesignWidth="333.333"
+      d:DesignHeight="1124"
       HighContrastAdjustment="None"
       mc:Ignorable="d">
 
     <Grid>
         <Grid.ChildrenTransitions>
             <TransitionCollection>
-                <EntranceThemeTransition FromHorizontalOffset="25" FromVerticalOffset="0" />
+                <EntranceThemeTransition FromHorizontalOffset="{StaticResource SettingsEntranceHorizontalOffset}" FromVerticalOffset="0" />
             </TransitionCollection>
         </Grid.ChildrenTransitions>
         <Grid.BackgroundTransition>

diff --git a/src/Notepads/Views/Settings/AdvancedSettingsPage.xaml b/src/Notepads/Views/Settings/AdvancedSettingsPage.xaml
@@ -5,13 +5,14 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:utilities="using:Notepads.Utilities"
       d:DesignWidth="333.333"
+      d:DesignHeight="768"
       HighContrastAdjustment="None"
       mc:Ignorable="d">
 
     <Grid>
         <Grid.ChildrenTransitions>
             <TransitionCollection>
-                <EntranceThemeTransition FromHorizontalOffset="25" FromVerticalOffset="0" />
+                <EntranceThemeTransition FromHorizontalOffset="{StaticResource SettingsEntranceHorizontalOffset}" FromVerticalOffset="0" />
             </TransitionCollection>
         </Grid.ChildrenTransitions>
         <Grid.BackgroundTransition>
@@ -85,7 +86,7 @@
                                   VerticalAlignment="Center"
                                   IsTextSearchEnabled="True"
                                   ItemsSource="{x:Bind SupportedLanguages, Mode=OneTime}"
-                                  d:PlaceholderText="System default">
+                                  d:PlaceholderText="System Default">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate x:DataType="utilities:LanguageItem">
                                     <TextBlock Text="{x:Bind Name}" />
@@ -99,10 +100,10 @@
                                    Margin="0,6,0,0"
                                    Visibility="Collapsed"
                                    d:Visibility="Visible" />
-                        <TextBlock x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_Description"
-                                   Style="{StaticResource DescriptionTextBlockStyle}"
-                                   Margin="0,4,0,0" />
                     </StackPanel>
+                    <TextBlock x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_Description"
+                               Style="{StaticResource DescriptionTextBlockStyle}"
+                               Margin="0,6,0,0" />
                 </StackPanel>
             </StackPanel>
         </ScrollViewer>

diff --git a/src/Notepads/Views/Settings/PersonalizationSettingsPage.xaml b/src/Notepads/Views/Settings/PersonalizationSettingsPage.xaml
@@ -3,15 +3,15 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      d:DesignHeight="900"
       d:DesignWidth="333.333"
+      d:DesignHeight="900"
       HighContrastAdjustment="None"
       mc:Ignorable="d">
 
     <Grid>
         <Grid.ChildrenTransitions>
             <TransitionCollection>
-                <EntranceThemeTransition FromHorizontalOffset="25" FromVerticalOffset="0" />
+                <EntranceThemeTransition FromHorizontalOffset="{StaticResource SettingsEntranceHorizontalOffset}" FromVerticalOffset="0" />
             </TransitionCollection>
         </Grid.ChildrenTransitions>
         <Grid.BackgroundTransition>
@@ -59,9 +59,9 @@
                         <Slider x:Name="BackgroundTintOpacitySlider"
                                 Width="200"
                                 Height="{StaticResource SliderHorizontalHeight}"
-                                StepFrequency="1"
                                 Maximum="100"
-                                Minimum="0" />
+                                Minimum="0"
+                                StepFrequency="1" />
                         <TextBlock Style="{StaticResource SubtitleTextBlockStyle}"
                                    Margin="12,0,0,2"
                                    VerticalAlignment="Center"

diff --git a/src/Notepads/Views/Settings/SettingsPanel.xaml b/src/Notepads/Views/Settings/SettingsPanel.xaml
@@ -30,7 +30,7 @@
         </Grid.RowDefinitions>
 
         <Grid Grid.Row="0"
-              BorderBrush="{ThemeResource SystemControlHighlightAltBaseMediumLowBrush}"
+              BorderBrush="{ThemeResource SystemControlForegroundBaseLowBrush}"
               BorderThickness="0,0,0,1"
               Margin="{StaticResource SettingsTitleMargin}">
             <TextBlock x:Name="TitleTextBlock"

diff --git a/src/Notepads/Views/Settings/TextAndEditorSettingsPage.xaml b/src/Notepads/Views/Settings/TextAndEditorSettingsPage.xaml
@@ -4,15 +4,15 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:settings="using:Notepads.Services"
-      d:DesignHeight="1600"
       d:DesignWidth="333.333"
+      d:DesignHeight="1700"
       HighContrastAdjustment="None"
       mc:Ignorable="d">
 
     <Grid>
         <Grid.ChildrenTransitions>
             <TransitionCollection>
-                <EntranceThemeTransition FromHorizontalOffset="25" FromVerticalOffset="0" />
+                <EntranceThemeTransition FromHorizontalOffset="{StaticResource SettingsEntranceHorizontalOffset}" FromVerticalOffset="0" />
             </TransitionCollection>
         </Grid.ChildrenTransitions>
         <Grid.BackgroundTransition>
@@ -118,7 +118,7 @@
                                   FontFamily="{x:Bind settings:AppSettingsService.EditorFontFamily}"
                                   IsEditable="False"
                                   ItemsSource="{x:Bind AvailableFontWeights, Mode=OneTime}"
-                                  d:PlaceholderText="Regular">
+                                  d:PlaceholderText="Normal">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <TextBlock Text="{Binding FontWeightLocalizedName}" FontWeight="{Binding FontWeight}" />