Skip to content

Commit 9f7a042

Browse files
bclothierbclothier
committed
Convert all whites for the label's foreground into CaptionLightBrush reference.
1 parent f911391 commit 9f7a042

File tree

8 files changed

+37
-24
lines changed

8 files changed

+37
-24
lines changed

‎Rubberduck.Core/UI/About/AboutControl.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
NavigateUri="https://github.com/rubberduck-vba/Rubberduck/issues/new/choose"
115115
TextDecorations="{x:Null}"
116116
Command="{Binding UriCommand}" CommandParameter="{Binding ElementName=GitHubIssueUrl, Path=NavigateUri}">
117-
<Label Height="40" Foreground="White" FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
117+
<Label Height="40" Foreground="{StaticResource CaptionLightBrush}" FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
118118
VerticalContentAlignment="Center" HorizontalContentAlignment="Stretch"
119119
Content="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_ReportAnIssue}"/>
120120
</Hyperlink>

‎Rubberduck.Core/UI/Settings/AddRemoveReferencesUserSettings.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</Label.Style>
4242
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
4343
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
44-
<Label Foreground="White"
44+
<Label Foreground="{StaticResource CaptionLightBrush}"
4545
FontWeight="SemiBold"
4646
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=PageHeader_ReferenceSettings}">
4747
</Label>

‎Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</Label.Style>
3939
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
4040
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
41-
<Label Foreground="White"
41+
<Label Foreground="{StaticResource CaptionLightBrush}"
4242
FontWeight="SemiBold"
4343
Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=PageHeader}">
4444
</Label>

‎Rubberduck.Core/UI/Settings/GeneralSettings.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</Label.Style>
5050
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
5151
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
52-
<Label Foreground="White"
52+
<Label Foreground="{StaticResource CaptionLightBrush}"
5353
FontWeight="SemiBold"
5454
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=PageHeader_GeneralSettings}">
5555
</Label>

‎Rubberduck.Core/UI/Settings/InspectionSettings.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</ObjectDataProvider>
3535

3636
<Style x:Key="HeaderText" TargetType="Label">
37-
<Setter Property="Foreground" Value="White"/>
37+
<Setter Property="Foreground" Value="{StaticResource CaptionLightBrush}"/>
3838
<Setter Property="FontWeight" Value="SemiBold"/>
3939
</Style>
4040
<Style x:Key="BorderHeader" TargetType="Border">

‎Rubberduck.Core/UI/Settings/TodoSettings.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</Label.Style>
4343
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
4444
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
45-
<Label Foreground="White"
45+
<Label Foreground="{StaticResource CaptionLightBrush}"
4646
FontWeight="SemiBold"
4747
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=PageHeader_TodoSettings}">
4848
</Label>

‎Rubberduck.Core/UI/Settings/UnitTestSettings.xaml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,31 @@
1212
d:DesignHeight="300" d:DesignWidth="300"
1313
d:DataContext="{d:DesignInstance {x:Type settings:UnitTestSettingsViewModel}, IsDesignTimeCreatable=False}">
1414
<UserControl.Resources>
15-
<converters:BindingModeToTextConverter x:Key="BindingModeToText" />
16-
<converters:BindingModeValueToTextConverter x:Key="BindingModeValueToText" />
17-
<converters:AssertModeToTextConverter x:Key="AssertModeToText" />
18-
<converters:AssertModeValueToTextConverter x:Key="AssertModeValueToText" />
19-
20-
<ObjectDataProvider x:Key="BindingMode"
15+
<ResourceDictionary>
16+
<ResourceDictionary.MergedDictionaries>
17+
<ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
18+
</ResourceDictionary.MergedDictionaries>
19+
20+
<converters:BindingModeToTextConverter x:Key="BindingModeToText" />
21+
<converters:BindingModeValueToTextConverter x:Key="BindingModeValueToText" />
22+
<converters:AssertModeToTextConverter x:Key="AssertModeToText" />
23+
<converters:AssertModeValueToTextConverter x:Key="AssertModeValueToText" />
24+
25+
<ObjectDataProvider x:Key="BindingMode"
2126
MethodName="GetValues"
2227
ObjectType="{x:Type core:Enum}">
23-
<ObjectDataProvider.MethodParameters>
24-
<x:Type Type="settingsConfig:BindingMode"/>
25-
</ObjectDataProvider.MethodParameters>
26-
</ObjectDataProvider>
27-
<ObjectDataProvider x:Key="AssertMode"
28+
<ObjectDataProvider.MethodParameters>
29+
<x:Type Type="settingsConfig:BindingMode"/>
30+
</ObjectDataProvider.MethodParameters>
31+
</ObjectDataProvider>
32+
<ObjectDataProvider x:Key="AssertMode"
2833
MethodName="GetValues"
2934
ObjectType="{x:Type core:Enum}">
30-
<ObjectDataProvider.MethodParameters>
31-
<x:Type Type="settingsConfig:AssertMode"/>
32-
</ObjectDataProvider.MethodParameters>
33-
</ObjectDataProvider>
35+
<ObjectDataProvider.MethodParameters>
36+
<x:Type Type="settingsConfig:AssertMode"/>
37+
</ObjectDataProvider.MethodParameters>
38+
</ObjectDataProvider>
39+
</ResourceDictionary>
3440
</UserControl.Resources>
3541
<Grid>
3642
<StackPanel Margin="5,5,5,0">
@@ -48,7 +54,7 @@
4854
</Label.Style>
4955
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
5056
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
51-
<Label Foreground="White"
57+
<Label Foreground="{StaticResource CaptionLightBrush}"
5258
FontWeight="SemiBold"
5359
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=PageHeader_UnitTestSettings}">
5460
</Label>

‎Rubberduck.Core/UI/Settings/WindowSettings.xaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77
mc:Ignorable="d"
88
d:DesignHeight="300" d:DesignWidth="300"
99
d:DataContext="{d:DesignInstance {x:Type settings:WindowSettingsViewModel}, IsDesignTimeCreatable=False}">
10-
10+
<UserControl.Resources>
11+
<ResourceDictionary>
12+
<ResourceDictionary.MergedDictionaries>
13+
<ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
14+
<ResourceDictionary Source="../Controls/Toolbar.xaml"/>
15+
</ResourceDictionary.MergedDictionaries>
16+
</ResourceDictionary>
17+
</UserControl.Resources>
1118
<Grid>
1219
<StackPanel Margin="5,5,5,0">
1320
<Label Background="DarkGray"
@@ -24,7 +31,7 @@
2431
</Label.Style>
2532
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
2633
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
27-
<Label Foreground="White"
34+
<Label Foreground="{StaticResource CaptionLightBrush}"
2835
FontWeight="SemiBold"
2936
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=PageHeader_WindowSettings}">
3037
</Label>

0 commit comments

Comments
 (0)