Skip to content

Commit bfd3e6a

Browse files
committed
improve brushes and more resources
1 parent 5cad0a6 commit bfd3e6a

6 files changed

Lines changed: 18 additions & 16 deletions

File tree

src/Notepads/Resource/CustomSettingsStyle.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
<SolidColorBrush x:Key="DangerTextForegroundBrush" Color="{StaticResource DangerTextForegroundColor}" />
1313
</ResourceDictionary>
1414
<ResourceDictionary x:Key="HighContrast">
15-
<SolidColorBrush x:Key="DangerTextForegroundBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
15+
<SolidColorBrush x:Key="DangerTextForegroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
1616
</ResourceDictionary>
1717
</ResourceDictionary.ThemeDictionaries>
1818

1919
<StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlTransparentBrush" />
2020

21+
<x:Double x:Key="SettingsEntranceHorizontalOffset">25</x:Double>
2122
<Thickness x:Key="SettingsContentPadding">20,8,20,12</Thickness>
2223
<Thickness x:Key="SettingsTitleMargin">20,0,20,0</Thickness>
2324
<Thickness x:Key="SettingsSubtitleMargin">0,0,0,6</Thickness>

src/Notepads/Views/Settings/AboutPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
d:DesignHeight="1120"
76
d:DesignWidth="333.333"
7+
d:DesignHeight="1124"
88
HighContrastAdjustment="None"
99
mc:Ignorable="d">
1010

1111
<Grid>
1212
<Grid.ChildrenTransitions>
1313
<TransitionCollection>
14-
<EntranceThemeTransition FromHorizontalOffset="25" FromVerticalOffset="0" />
14+
<EntranceThemeTransition FromHorizontalOffset="{StaticResource SettingsEntranceHorizontalOffset}" FromVerticalOffset="0" />
1515
</TransitionCollection>
1616
</Grid.ChildrenTransitions>
1717
<Grid.BackgroundTransition>

src/Notepads/Views/Settings/AdvancedSettingsPage.xaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:utilities="using:Notepads.Utilities"
77
d:DesignWidth="333.333"
8+
d:DesignHeight="768"
89
HighContrastAdjustment="None"
910
mc:Ignorable="d">
1011

1112
<Grid>
1213
<Grid.ChildrenTransitions>
1314
<TransitionCollection>
14-
<EntranceThemeTransition FromHorizontalOffset="25" FromVerticalOffset="0" />
15+
<EntranceThemeTransition FromHorizontalOffset="{StaticResource SettingsEntranceHorizontalOffset}" FromVerticalOffset="0" />
1516
</TransitionCollection>
1617
</Grid.ChildrenTransitions>
1718
<Grid.BackgroundTransition>
@@ -85,7 +86,7 @@
8586
VerticalAlignment="Center"
8687
IsTextSearchEnabled="True"
8788
ItemsSource="{x:Bind SupportedLanguages, Mode=OneTime}"
88-
d:PlaceholderText="System default">
89+
d:PlaceholderText="System Default">
8990
<ComboBox.ItemTemplate>
9091
<DataTemplate x:DataType="utilities:LanguageItem">
9192
<TextBlock Text="{x:Bind Name}" />
@@ -99,10 +100,10 @@
99100
Margin="0,6,0,0"
100101
Visibility="Collapsed"
101102
d:Visibility="Visible" />
102-
<TextBlock x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_Description"
103-
Style="{StaticResource DescriptionTextBlockStyle}"
104-
Margin="0,4,0,0" />
105103
</StackPanel>
104+
<TextBlock x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_Description"
105+
Style="{StaticResource DescriptionTextBlockStyle}"
106+
Margin="0,6,0,0" />
106107
</StackPanel>
107108
</StackPanel>
108109
</ScrollViewer>

src/Notepads/Views/Settings/PersonalizationSettingsPage.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
d:DesignHeight="900"
76
d:DesignWidth="333.333"
7+
d:DesignHeight="900"
88
HighContrastAdjustment="None"
99
mc:Ignorable="d">
1010

1111
<Grid>
1212
<Grid.ChildrenTransitions>
1313
<TransitionCollection>
14-
<EntranceThemeTransition FromHorizontalOffset="25" FromVerticalOffset="0" />
14+
<EntranceThemeTransition FromHorizontalOffset="{StaticResource SettingsEntranceHorizontalOffset}" FromVerticalOffset="0" />
1515
</TransitionCollection>
1616
</Grid.ChildrenTransitions>
1717
<Grid.BackgroundTransition>
@@ -59,9 +59,9 @@
5959
<Slider x:Name="BackgroundTintOpacitySlider"
6060
Width="200"
6161
Height="{StaticResource SliderHorizontalHeight}"
62-
StepFrequency="1"
6362
Maximum="100"
64-
Minimum="0" />
63+
Minimum="0"
64+
StepFrequency="1" />
6565
<TextBlock Style="{StaticResource SubtitleTextBlockStyle}"
6666
Margin="12,0,0,2"
6767
VerticalAlignment="Center"

src/Notepads/Views/Settings/SettingsPanel.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</Grid.RowDefinitions>
3131

3232
<Grid Grid.Row="0"
33-
BorderBrush="{ThemeResource SystemControlHighlightAltBaseMediumLowBrush}"
33+
BorderBrush="{ThemeResource SystemControlForegroundBaseLowBrush}"
3434
BorderThickness="0,0,0,1"
3535
Margin="{StaticResource SettingsTitleMargin}">
3636
<TextBlock x:Name="TitleTextBlock"

src/Notepads/Views/Settings/TextAndEditorSettingsPage.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:settings="using:Notepads.Services"
7-
d:DesignHeight="1600"
87
d:DesignWidth="333.333"
8+
d:DesignHeight="1700"
99
HighContrastAdjustment="None"
1010
mc:Ignorable="d">
1111

1212
<Grid>
1313
<Grid.ChildrenTransitions>
1414
<TransitionCollection>
15-
<EntranceThemeTransition FromHorizontalOffset="25" FromVerticalOffset="0" />
15+
<EntranceThemeTransition FromHorizontalOffset="{StaticResource SettingsEntranceHorizontalOffset}" FromVerticalOffset="0" />
1616
</TransitionCollection>
1717
</Grid.ChildrenTransitions>
1818
<Grid.BackgroundTransition>
@@ -118,7 +118,7 @@
118118
FontFamily="{x:Bind settings:AppSettingsService.EditorFontFamily}"
119119
IsEditable="False"
120120
ItemsSource="{x:Bind AvailableFontWeights, Mode=OneTime}"
121-
d:PlaceholderText="Regular">
121+
d:PlaceholderText="Normal">
122122
<ComboBox.ItemTemplate>
123123
<DataTemplate>
124124
<TextBlock Text="{Binding FontWeightLocalizedName}" FontWeight="{Binding FontWeight}" />

0 commit comments

Comments
 (0)