Removed template colors, replaced any that I need with my own

This commit is contained in:
Caeden Statia 2020-01-31 20:21:36 -08:00
parent 88f3078232
commit 2fad27fc68
2 changed files with 23 additions and 46 deletions

View file

@ -11,13 +11,13 @@
<Style TargetType="Button">
<Setter Property="Background"
Value="{DynamicResource 2ndBackgroundBrush}" />
Value="{DynamicResource ButtonBackground}" />
<Setter Property="BorderBrush"
Value="{DynamicResource 2ndBackgroundBrush}" />
Value="{DynamicResource ButtonBackground}" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="Foreground"
Value="{DynamicResource LabelBrush}" />
Value="{DynamicResource TextColor}" />
<Setter Property="HorizontalContentAlignment"
Value="Center" />
<Setter Property="VerticalContentAlignment"
@ -31,26 +31,25 @@
<ControlTemplate TargetType="{x:Type Button}">
<Border Name="Chrome"
Background="{TemplateBinding Background}"
BorderBrush="{DynamicResource WindowBorderBrush}"
BorderBrush="{DynamicResource ButtonOutline}"
BorderThickness="{TemplateBinding BorderThickness}"
SnapsToDevicePixels="true"
TextBlock.Foreground="{DynamicResource LabelBrush}">
TextBlock.Foreground="{DynamicResource TextColor}">
<ContentPresenter Name="Presenter"
Margin="{TemplateBinding Padding}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
TextBlock.Foreground="{DynamicResource LabelBrush}" />
TextBlock.Foreground="{DynamicResource TextColor}" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver"
Value="True">
<Setter Property="Background"
Value="{DynamicResource LightAccent}" />
<Setter Property="Foreground"
Value="{DynamicResource HighlightBrush}" />
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="{DynamicResource ButtonHighlighted}"/>
<Setter Property="Foreground" Value="{DynamicResource TextHighlighted}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="{DynamicResource ButtonDisabledBackground}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
@ -65,7 +64,7 @@
<Setter Property="Label.FontSize"
Value="13" />
<Setter Property="Label.Foreground"
Value="White" />
Value="{DynamicResource TextColor}" />
<Setter Property="Label.Height"
Value="Auto" />
<Setter Property="Label.Width"
@ -85,11 +84,11 @@
</Style>
<Style TargetType="TextBlock">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource LabelBrush}"/>
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextColor}"/>
</Style>
<Style TargetType="GridViewColumnHeader">
<Setter Property="GridViewColumnHeader.Foreground" Value="{DynamicResource LabelBrush}"/>
<Setter Property="GridViewColumnHeader.Foreground" Value="{DynamicResource TextColor}"/>
<Setter Property="GridViewColumnHeader.Background" Value="{DynamicResource 2ndBackgroundBrush}"/>
<Setter Property="GridViewColumnHeader.BorderBrush" Value="{DynamicResource ModColumnBorderBrush}"/>
<Setter Property="Template">

View file

@ -1,36 +1,14 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<FontFamily x:Key="DefaultFontFamily">Tahoma</FontFamily>
<Color x:Key="WindowBorderColor">#FF1E90FF</Color>
<Color x:Key="LightAccentColor">#454545</Color>
<Color x:Key="2ndBackgroundColor">#2E2E2E</Color>
<SolidColorBrush x:Key="WindowBorderBrush"
Color="DodgerBlue" />
<SolidColorBrush x:Key="LightAccent"
Color="#454545" />
<SolidColorBrush x:Key="DarkAccent"
Color="#383838" />
<SolidColorBrush x:Key="ItemText"
Color="#d1d1d1" />
<LinearGradientBrush x:Key="WindowBackgroundBrush"
EndPoint="0.5,1"
StartPoint="0.5,0"
SpreadMethod="Reflect">
<GradientStop Color="#242424"
Offset="1" />
<GradientStop Color="#FF2C2C2C"
Offset="1" />
</LinearGradientBrush>
<SolidColorBrush x:Key="2ndBackgroundBrush" Color="#2E2E2E" />
<SolidColorBrush x:Key="WindowForegroundBrush" Color="Gray" />
<SolidColorBrush x:Key="LabelBrush" Color="LightGray" />
<SolidColorBrush x:Key="HighlightBrush" Color="White" />
<SolidColorBrush x:Key="BackgroundBrush" Color="#FF1B1B1B" />
<!--ModAssistant unique colors.-->
<SolidColorBrush x:Key="TextColor" Color="LightGray" />
<SolidColorBrush x:Key="TextHighlighted" Color="White" />
<SolidColorBrush x:Key="ButtonBackground" Color="#2E2E2E" />
<SolidColorBrush x:Key="ButtonOutline" Color="#696969" />
<SolidColorBrush x:Key="ButtonHighlightedBackground" Color="#454545" />
<SolidColorBrush x:Key="ButtonDisabledBackground" Color="#1a1a1a" />
<SolidColorBrush x:Key="ModColumnBorderBrush" Color="LightGray"/>
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="#454545"/>