Clean up the remaining miscellaneous use of colors, provide color brush reference for gray, white and black to make it easy to reference colors.

Author: bclothier

Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesWindow.xaml

@@ -49,7 +49,7 @@
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsSelected" Value="True">
-                                    <Setter TargetName="PART_Border" Property="BorderBrush" Value="Blue" />
+                                    <Setter TargetName="PART_Border" Property="BorderBrush" Value="{StaticResource TabSelectionUnderlineBrush}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>

Rubberduck.Core/UI/Controls/EmptyUIRefresh.xaml

@@ -6,10 +6,15 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>
-        <BitmapImage x:Key="DoubleArrowImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <BitmapImage x:Key="DoubleArrowImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
+        </ResourceDictionary>
     </UserControl.Resources>
 
-    <Border Background="AliceBlue" DataContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext}">
+    <Border Background="{StaticResource BackgroundSoftBrush}" DataContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext}">
         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="WrapWithOverflow" TextAlignment="Center"
                        MinWidth="200">
             <Run FontWeight="Bold" Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EmptyUIRefreshMessage_Title}"/><LineBreak/>

Rubberduck.Core/UI/Controls/GroupingGrid.xaml

@@ -29,7 +29,7 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate>
-                            <Expander Background="{StaticResource BackgroundLightBrush}" Foreground="Black" FontWeight="SemiBold" 
+                            <Expander Background="{StaticResource BackgroundLightBrush}" Foreground="{StaticResource CaptionDarkBrush}" FontWeight="SemiBold" 
                                   IsExpanded="{Binding InitialExpandedState, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:GroupingGrid}}}">
                                 <Expander.Header>
                                     <StackPanel Orientation="Horizontal">

Rubberduck.Core/UI/Controls/ToolBar.xaml

@@ -266,9 +266,9 @@
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                     <Border x:Name="Bd" SnapsToDevicePixels="true" CornerRadius="0,0,3,3" Background="{TemplateBinding Background}">
                         <Canvas Width="7" VerticalAlignment="Bottom" SnapsToDevicePixels="true" Margin="2,7,2,2" Height="6" HorizontalAlignment="Right">
-                            <Path Data="M 1.5 1 L 1.5 6" Stroke="White"/>
+                            <Path Data="M 1.5 1 L 1.5 6" Stroke="{StaticResource WhiteBrush}"/>
                             <Path Data="M 0.5 0 L 0.5 5" Stroke="{TemplateBinding Foreground}"/>
-                            <Path Data="M 3.5 0.5 L 7 3.5 L 4 6.5 Z" Fill="White"/>
+                            <Path Data="M 3.5 0.5 L 7 3.5 L 4 6.5 Z" Fill="{StaticResource WhiteBrush}"/>
                             <Path Data="M 3 -0.5 L 6 2.5 L 3 5.5 Z" Fill="{TemplateBinding Foreground}"/>
                         </Canvas>
                     </Border>
@@ -301,9 +301,9 @@
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                     <Border x:Name="Bd" SnapsToDevicePixels="true" CornerRadius="0,3,3,0" Background="{TemplateBinding Background}">
                         <Canvas Width="6" VerticalAlignment="Bottom" SnapsToDevicePixels="true" Margin="7,2,2,2" Height="7" HorizontalAlignment="Right">
-                            <Path Data="M 1 1.5 L 6 1.5" Stroke="White"/>
+                            <Path Data="M 1 1.5 L 6 1.5" Stroke="{StaticResource WhiteBrush}"/>
                             <Path Data="M 0 0.5 L 5 0.5" Stroke="{TemplateBinding Foreground}"/>
-                            <Path Data="M 0.5 4 L 6.5 4 L 3.5 7 Z" Fill="White"/>
+                            <Path Data="M 0.5 4 L 6.5 4 L 3.5 7 Z" Fill="{StaticResource WhiteBrush}"/>
                             <Path Data="M -0.5 3 L 5.5 3 L 2.5 6 Z" Fill="{TemplateBinding Foreground}"/>
                         </Canvas>
                     </Border>
@@ -337,7 +337,7 @@
                                 <DrawingBrush ViewboxUnits="Absolute" ViewportUnits="Absolute" Viewport="0,0,4,4" Viewbox="0,0,4,4" TileMode="Tile">
                                     <DrawingBrush.Drawing>
                                         <DrawingGroup>
-                                            <GeometryDrawing Brush="White" Geometry="M 1 1 L 1 3 L 3 3 L 3 1 z"/>
+                                            <GeometryDrawing Brush="{StaticResource WhiteBrush}" Geometry="M 1 1 L 1 3 L 3 3 L 3 1 z"/>
                                             <GeometryDrawing Brush="{StaticResource ToolBarGripper}" Geometry="M 0 0 L 0 2 L 2 2 L 2 0 z"/>
                                         </DrawingGroup>
                                     </DrawingBrush.Drawing>

Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml

@@ -256,7 +256,7 @@
 
         <GridSplitter Grid.Row="2" Height="5" ShowsPreview="True" Cursor="SizeNS" HorizontalAlignment="Stretch"/>
 
-        <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="DimGray">
+        <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="{StaticResource GrayBrush}">
             <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
                 <StackPanel Orientation="Vertical" MinHeight="48" Background="{StaticResource BackgroundLightBrush}">
                     <Grid Margin="4" HorizontalAlignment="Stretch">

Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml

@@ -41,7 +41,7 @@
                 <Setter Property="HorizontalContentAlignment" Value="Left"/>
                 <Setter Property="VerticalContentAlignment" Value="Center"/>
                 <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="BorderBrush" Value="Black"/>
+                <Setter Property="BorderBrush" Value="{StaticResource BlackBrush}"/>
                 <Setter Property="BorderThickness" Value="0,.5,0,0"/>
                 <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
                 <Setter Property="Height" Value="26" />

Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersView.xaml

@@ -40,7 +40,7 @@
                 <Setter Property="HorizontalContentAlignment" Value="Left"/>
                 <Setter Property="VerticalContentAlignment" Value="Center"/>
                 <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="BorderBrush" Value="Black"/>
+                <Setter Property="BorderBrush" Value="{StaticResource BlackBrush}"/>
                 <Setter Property="BorderThickness" Value="0,.5,0,0"/>
                 <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
                 <Setter Property="Height" Value="26" />

Rubberduck.Core/UI/Settings/GeneralSettings.xaml

@@ -114,7 +114,7 @@
                         <Label DockPanel.Dock="Left" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeysLabel}" FontWeight="SemiBold" />
                         <Label DockPanel.Dock="Right" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyRestrictionLabel}"
                                Visibility="{Binding ShouldDisplayHotkeyModificationLabel, Converter={StaticResource BoolToVisibility}}"
-                               Foreground="Red"
+                               Foreground="{StaticResource CaptionErrorBrush}"
                                FontWeight="Bold"/>
                     </DockPanel>
 

Rubberduck.Core/UI/Settings/SettingsControl.xaml

@@ -98,7 +98,7 @@
         <Border Grid.ColumnSpan="2"
                 Height="50"
                 VerticalAlignment="Top"
-                BorderBrush="Black"
+                BorderBrush="{StaticResource BlackBrush}"
                 BorderThickness="0, 1">
             <StackPanel Background="{StaticResource BackgroundLightBrush}">
                 <Label Content="{Binding ElementName=ListBox, Path=SelectedItem.Label}" FontWeight="Bold" />
@@ -123,7 +123,7 @@
                 Grid.ColumnSpan="2"
                 Height="40"
                 VerticalAlignment="Bottom"
-                BorderBrush="Black"
+                BorderBrush="{StaticResource BlackBrush}"
                 BorderThickness="0, 1, 0, 0">
             <DockPanel VerticalAlignment="Center"
                        Height="40"

Rubberduck.Core/UI/Styles/DefaultStyle.xaml

@@ -23,7 +23,6 @@
     <Color x:Key="GlyphPanelColor">#FFF8F8FF</Color>
     <Color x:Key="GlyphPanelTemplateColor">#FF212121</Color>
     <Color x:Key="GlyphPanelBorderColor">#80DADADA</Color>
-    <Color x:Key="SoftBackgroundColor">#FFF8F8FF</Color>
     <Color x:Key="DropShadowColor">#71000000</Color>
     <Color x:Key="GreenButtonColor">#FF40C954</Color>
     <Color x:Key="GreenButtonBorderColor">#FF008000</Color>
@@ -36,12 +35,19 @@
     <Color x:Key="ExpanderBorderColor">#FFA9A9A9</Color>
     <Color x:Key="ExpanderBackgroundColor">#FFFFFFFF</Color>
     <Color x:Key="CaptionLightColor">#FFFFFFFF</Color>
+    <Color x:Key="CaptionDarkColor">#FF000000</Color>
+    <Color x:Key="CaptionErrorColor">#FFFF0000</Color>
     <Color x:Key="CaptionDisabledColor">#FF808080</Color>
     <Color x:Key="CaptionHyperlinkColor">#FF0000FF</Color>
     <Color x:Key="CaptionHyperlinkVisitedColor">#FFFF0000</Color>
     <Color x:Key="BackgroundDarkColor">#FFA9A9A9</Color>
     <Color x:Key="BackgroundLightColor">#FFF5F5F5</Color>
+    <Color x:Key="BackgroundSoftColor">#FFF8F8FF</Color>
     <Color x:Key="HeaderBackgroundDarkColor">#FFA9A9A9</Color>
+    <Color x:Key="TabSelectionUnderlineColor">#FF0000FF</Color>
+    <Color x:Key="GrayColor">#FF696969</Color>
+    <Color x:Key="BlackColor">#FFFFFFFF</Color>
+    <Color x:Key="WhiteColor">#FF000000</Color>
 
     <SolidColorBrush x:Key="HighlightGradientStartBrush" Color="{StaticResource HighlightGradientStartColor}"/>
     <SolidColorBrush x:Key="HighlightGradientEndBrush" Color="{StaticResource HighlightGradientEndColor}"/>
@@ -52,7 +58,6 @@
     <SolidColorBrush x:Key="GlyphPanelBrush" Color="{StaticResource GlyphPanelColor}"/>
     <SolidColorBrush x:Key="GlyphPanelTemplateBrush" Color="{StaticResource GlyphPanelTemplateColor}"/>
     <SolidColorBrush x:Key="GlyphPanelBorderBrush" Color="{StaticResource GlyphPanelBorderColor}"/>
-    <SolidColorBrush x:Key="SoftBackgroundBrush" Color="{StaticResource SoftBackgroundColor}"/>
     <SolidColorBrush x:Key="GreenButtonBrush" Color="{StaticResource GreenButtonColor}"/>
     <SolidColorBrush x:Key="GreenButtonBorderBrush" Color="{StaticResource GreenButtonBorderColor}"/>
     <SolidColorBrush x:Key="GreenButtonMouseOverBrush" Color="{StaticResource GreenButtonMouseOverColor}"/>
@@ -64,14 +69,21 @@
     <SolidColorBrush x:Key="ExpanderBackgroundBrush" Color="{StaticResource ExpanderBackgroundColor}"/>
     <SolidColorBrush x:Key="ExpanderBorderBrush" Color="{StaticResource ExpanderBorderColor}"/>
     <SolidColorBrush x:Key="CaptionLightBrush" Color="{StaticResource CaptionLightColor}"/>
+    <SolidColorBrush x:Key="CaptionDarkBrush" Color="{StaticResource CaptionDarkColor}"/>
+    <SolidColorBrush x:Key="CaptionErrorBrush" Color="{StaticResource CaptionErrorColor}"/>
     <SolidColorBrush x:Key="CaptionDisabledBrush" Color="{StaticResource CaptionDisabledColor}"/>
     <SolidColorBrush x:Key="CaptionHyperlinkBrush" Color="{StaticResource CaptionHyperlinkColor}"/>
     <SolidColorBrush x:Key="CaptionHyperlinkVisitedBrush" Color="{StaticResource CaptionHyperlinkVisitedColor}"/>
     <SolidColorBrush x:Key="BackgroundDarkBrush" Color="{StaticResource BackgroundDarkColor}"/>
     <SolidColorBrush x:Key="BackgroundLightBrush" Color="{StaticResource BackgroundLightColor}"/>
     <SolidColorBrush x:Key="BackgroundWhiteBrush" Color="{StaticResource BackgroundWhiteColor}"/>
+    <SolidColorBrush x:Key="BackgroundSoftBrush" Color="{StaticResource BackgroundSoftColor}"/>
     <SolidColorBrush x:Key="HeaderBackgroundDarkBrush" Color="{StaticResource HeaderBackgroundDarkColor}"/>
-
+    <SolidColorBrush x:Key="TabSelectionUnderlineBrush" Color="{StaticResource TabSelectionUnderlineColor}"/>
+    <SolidColorBrush x:Key="GrayBrush" Color="{StaticResource GrayColor}"/>
+    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource BlackColor}"/>
+    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource WhiteColor}"/>
+    
     <SolidColorBrush x:Key="Item.MouseOver.Background" Color="#1F26A0DA"/>
     <SolidColorBrush x:Key="Item.MouseOver.Border" Color="#A826A0DA"/>
     <SolidColorBrush x:Key="Item.SelectedActive.Border" Color="#ADC6E5"/>
@@ -112,7 +124,7 @@
             </Style>
         </Style.Resources>
         <Setter Property="BorderThickness" Value="0,.5,0,0" />
-        <Setter Property="BorderBrush" Value="DarkGray" />
+        <Setter Property="BorderBrush" Value="{StaticResource ExpanderBorderBrush}" />
         <Setter Property="Height" Value="26" />
         <Setter Property="TextBlock.FontWeight" Value="Normal" />
         <Style.Triggers>