Skip to content

Commit a1ae8c0

Browse files
committed
Merge branch 'DarkTheme' of https://github.com/EdonGashi/MaterialDesignInXamlToolkit into EdonGashi-DarkTheme
2 parents 1bb9b75 + 31d77b4 commit a1ae8c0

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Card.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</ControlTemplate>
3636
<Style TargetType="{x:Type wpf:Card}">
3737
<Setter Property="Template" Value="{StaticResource CardTemplate}" />
38-
<Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
38+
<Setter Property="Background" Value="{DynamicResource MaterialDesignCardBackground}" />
3939
<Setter Property="VerticalAlignment" Value="Top" />
4040
<Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth2" />
4141
</Style>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Dark.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<SolidColorBrush x:Key="ValidationErrorBrush" Color="{StaticResource ValidationErrorColor}"/>
77

88
<SolidColorBrush x:Key="MaterialDesignBackground" Color="#FF000000" po:Freeze="True" />
9-
<SolidColorBrush x:Key="MaterialDesignPaper" Color="#FF37474f" po:Freeze="True" />
9+
<SolidColorBrush x:Key="MaterialDesignPaper" Color="#FF303030" po:Freeze="True" />
10+
<SolidColorBrush x:Key="MaterialDesignCardBackground" Color="#FF424242" po:Freeze="True" />
1011
<SolidColorBrush x:Key="MaterialDesignBody" Color="#DDFFFFFF" po:Freeze="True" />
1112
<SolidColorBrush x:Key="MaterialDesignBodyLight" Color="#89FFFFFF" po:Freeze="True" />
1213
<SolidColorBrush x:Key="MaterialDesignColumnHeader" Color="#BCFFFFFF" po:Freeze="True" /><!-- 74% -->

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</ResourceDictionary.MergedDictionaries>
3838
<SolidColorBrush x:Key="MaterialDesignLightBackground" Color="#FFFAFAFA"/>
3939
<SolidColorBrush x:Key="MaterialDesignLightForeground" Color="#DD000000"/>
40-
<SolidColorBrush x:Key="MaterialDesignDarkBackground" Color="#FF37474f"/>
40+
<SolidColorBrush x:Key="MaterialDesignDarkBackground" Color="#FF303030"/>
4141
<SolidColorBrush x:Key="MaterialDesignDarkForeground" Color="#FFFAFAFA"/>
4242
<SolidColorBrush x:Key="MaterialDesignDarkSeparatorBackground" Color="#1F000000" />
4343
<SolidColorBrush x:Key="MaterialDesignLightSeparatorBackground" Color="#1FFFFFFF" />

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Light.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<SolidColorBrush x:Key="MaterialDesignBackground" Color="#FFFFFFFF" po:Freeze="True" />
99
<SolidColorBrush x:Key="MaterialDesignPaper" Color="#FFfafafa" po:Freeze="True" />
10+
<SolidColorBrush x:Key="MaterialDesignCardBackground" Color="#FFfafafa" po:Freeze="True" />
1011
<SolidColorBrush x:Key="MaterialDesignBody" Color="#DD000000" po:Freeze="True" />
1112
<SolidColorBrush x:Key="MaterialDesignBodyLight" Color="#89000000" po:Freeze="True" />
1213
<SolidColorBrush x:Key="MaterialDesignColumnHeader" Color="#BC000000" po:Freeze="True" /> <!-- 74% -->

0 commit comments

Comments
 (0)