Skip to content

Commit 57e9ad9

Browse files
bclothierbclothier
committed
Convert all grey header styles into references.
1 parent c78b6cf commit 57e9ad9

File tree

8 files changed

+18
-16
lines changed

8 files changed

+18
-16
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<RowDefinition Height="Auto"/>
2828
</Grid.RowDefinitions>
2929
<StackPanel Grid.Row="0" Margin="5,5,5,0">
30-
<Label Background="DarkGray"
30+
<Label Background="{StaticResource HeaderBackgroundDarkBrush}"
3131
HorizontalContentAlignment="Stretch"
3232
Margin="0,0,0,3">
3333
<Label.Style>
@@ -39,7 +39,7 @@
3939
</Style.Resources>
4040
</Style>
4141
</Label.Style>
42-
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
42+
<DockPanel Background="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
4343
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
4444
<Label Foreground="{StaticResource CaptionLightBrush}"
4545
FontWeight="SemiBold"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</Grid.RowDefinitions>
2525
<ScrollViewer x:Name="ScrollViewer" Grid.Row="0">
2626
<StackPanel Margin="5,5,5,0" ScrollViewer.VerticalScrollBarVisibility="Auto">
27-
<Label Background="DarkGray"
27+
<Label Background="{StaticResource HeaderBackgroundDarkBrush}"
2828
HorizontalContentAlignment="Stretch"
2929
Margin="0,0,0,3">
3030
<Label.Style>
@@ -36,7 +36,7 @@
3636
</Style.Resources>
3737
</Style>
3838
</Label.Style>
39-
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
39+
<DockPanel Background="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
4040
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
4141
<Label Foreground="{StaticResource CaptionLightBrush}"
4242
FontWeight="SemiBold"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<ScrollViewer x:Name="ScrollViewer">
3636
<Grid>
3737
<StackPanel Grid.Row="0" Margin="5,5,5,0">
38-
<Label Background="DarkGray"
38+
<Label Background="{StaticResource HeaderBackgroundDarkBrush}"
3939
HorizontalContentAlignment="Stretch"
4040
Margin="0,0,0,3">
4141
<Label.Style>
@@ -47,7 +47,7 @@
4747
</Style.Resources>
4848
</Style>
4949
</Label.Style>
50-
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
50+
<DockPanel Background="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
5151
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
5252
<Label Foreground="{StaticResource CaptionLightBrush}"
5353
FontWeight="SemiBold"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Setter Property="FontWeight" Value="SemiBold"/>
3939
</Style>
4040
<Style x:Key="BorderHeader" TargetType="Border">
41-
<Setter Property="Background" Value="DarkGray"/>
41+
<Setter Property="Background" Value="{StaticResource HeaderBackgroundDarkBrush}"/>
4242
<Setter Property="CornerRadius" Value="5"/>
4343
</Style>
4444
</ResourceDictionary>
@@ -83,7 +83,7 @@
8383
</StackPanel>
8484
</DockPanel>
8585
</Border>
86-
<Border BorderBrush="DarkGray" BorderThickness="1" CornerRadius="2">
86+
<Border BorderBrush="{StaticResource HeaderBackgroundDarkBrush}" BorderThickness="1" CornerRadius="2">
8787
<controls:GroupingGrid ItemsSource="{Binding InspectionSettings}"
8888
AutoGenerateColumns="False"
8989
CanUserReorderColumns="False"
@@ -177,7 +177,7 @@
177177
</Button>
178178
</ToolBar>
179179
</ToolBarTray>
180-
<Border BorderBrush="DarkGray" BorderThickness="1" CornerRadius="2">
180+
<Border BorderBrush="{StaticResource HeaderBackgroundDarkBrush}" BorderThickness="1" CornerRadius="2">
181181
<DataGrid Name="WhitelistedIdentifiersGrid"
182182
ItemsSource="{Binding WhitelistedIdentifierSettings}"
183183
AutoGenerateColumns="False"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</Grid.RowDefinitions>
2929

3030
<StackPanel Margin="5,5,5,0">
31-
<Label Background="DarkGray"
31+
<Label Background="{StaticResource HeaderBackgroundDarkBrush}"
3232
HorizontalContentAlignment="Stretch"
3333
Margin="0,0,0,3">
3434
<Label.Style>
@@ -40,7 +40,7 @@
4040
</Style.Resources>
4141
</Style>
4242
</Label.Style>
43-
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
43+
<DockPanel Background="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
4444
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
4545
<Label Foreground="{StaticResource CaptionLightBrush}"
4646
FontWeight="SemiBold"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</UserControl.Resources>
4141
<Grid>
4242
<StackPanel Margin="5,5,5,0">
43-
<Label Background="DarkGray"
43+
<Label Background="{StaticResource HeaderBackgroundDarkBrush}"
4444
HorizontalContentAlignment="Stretch"
4545
Margin="0,0,0,3">
4646
<Label.Style>
@@ -52,7 +52,7 @@
5252
</Style.Resources>
5353
</Style>
5454
</Label.Style>
55-
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
55+
<DockPanel Background="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
5656
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
5757
<Label Foreground="{StaticResource CaptionLightBrush}"
5858
FontWeight="SemiBold"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</UserControl.Resources>
1818
<Grid>
1919
<StackPanel Margin="5,5,5,0">
20-
<Label Background="DarkGray"
20+
<Label Background="{StaticResource HeaderBackgroundDarkBrush}"
2121
HorizontalContentAlignment="Stretch"
2222
Margin="0,0,0,3">
2323
<Label.Style>
@@ -29,7 +29,7 @@
2929
</Style.Resources>
3030
</Style>
3131
</Label.Style>
32-
<DockPanel Background="DarkGray" FlowDirection="LeftToRight">
32+
<DockPanel Background="{StaticResource HeaderBackgroundDarkBrush}" FlowDirection="LeftToRight">
3333
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
3434
<Label Foreground="{StaticResource CaptionLightBrush}"
3535
FontWeight="SemiBold"

‎Rubberduck.Core/UI/Styles/DefaultStyle.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<Color x:Key="CaptionDisabledColor">#FF808080</Color>
3939
<Color x:Key="BackgroundDarkColor">#FFA9A9A9</Color>
4040
<Color x:Key="BackgroundLightColor">#FFF5F5F5</Color>
41+
<Color x:Key="HeaderBackgroundDarkColor">#FFA9A9A9</Color>
4142

4243
<SolidColorBrush x:Key="HighlightGradientStartBrush" Color="{StaticResource HighlightGradientStartColor}"/>
4344
<SolidColorBrush x:Key="HighlightGradientEndBrush" Color="{StaticResource HighlightGradientEndColor}"/>
@@ -63,6 +64,7 @@
6364
<SolidColorBrush x:Key="BackgroundDarkBrush" Color="{StaticResource BackgroundDarkColor}"/>
6465
<SolidColorBrush x:Key="BackgroundLightBrush" Color="{StaticResource BackgroundLightColor}"/>
6566
<SolidColorBrush x:Key="BackgroundWhiteBrush" Color="{StaticResource BackgroundWhiteColor}"/>
67+
<SolidColorBrush x:Key="HeaderBackgroundDarkBrush" Color="{StaticResource HeaderBackgroundDarkColor}"/>
6668

6769
<SolidColorBrush x:Key="Item.MouseOver.Background" Color="#1F26A0DA"/>
6870
<SolidColorBrush x:Key="Item.MouseOver.Border" Color="#A826A0DA"/>
@@ -96,7 +98,7 @@
9698
<Setter Property="Margin" Value="2,0,2,0" />
9799
<Setter Property="VerticalAlignment" Value="Top" />
98100
</Style>
99-
101+
100102
<Style x:Key="PrettifyRow" TargetType="{x:Type DataGridRow}">
101103
<Style.Resources>
102104
<Style TargetType="{x:Type Border}">

0 commit comments

Comments
 (0)