Skip to content

Commit 208de7d

Browse files
committed
Merge branch 'master' of https://github.com/Sergey-Terekhin/MaterialDesignInXamlToolkit into Sergey-Terekhin-master
2 parents b1aa6f7 + 9f608bc commit 208de7d

File tree

2 files changed

+47
-0
lines changed

2 files changed

+47
-0
lines changed

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,10 @@
204204
<SubType>Designer</SubType>
205205
<Generator>MSBuild:Compile</Generator>
206206
</Page>
207+
<Page Include="Themes\MaterialDesignTheme.TextBlock.xaml">
208+
<Generator>MSBuild:Compile</Generator>
209+
<SubType>Designer</SubType>
210+
</Page>
207211
</ItemGroup>
208212
<ItemGroup>
209213
<Compile Include="Card.cs" />
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<Style TargetType="{x:Type TextBlock}" x:Key="MaterialDesignCaptionTextBlock">
4+
<Setter Property="FontSize" Value="12"/>
5+
<Setter Property="FontWeight" Value="Regular"/>
6+
</Style>
7+
<Style TargetType="{x:Type TextBlock}" x:Key="MaterialDesignBody1TextBlock">
8+
<Setter Property="FontSize" Value="13"/>
9+
<Setter Property="FontWeight" Value="Regular"/>
10+
</Style>
11+
<Style TargetType="{x:Type TextBlock}" x:Key="MaterialDesignBody2TextBlock">
12+
<Setter Property="FontSize" Value="13"/>
13+
<Setter Property="FontWeight" Value="Medium"/>
14+
</Style>
15+
<Style TargetType="{x:Type TextBlock}" x:Key="MaterialDesignSubheadingTextBlock">
16+
<Setter Property="FontSize" Value="15"/>
17+
<Setter Property="FontWeight" Value="Regular"/>
18+
</Style>
19+
<Style TargetType="{x:Type TextBlock}" x:Key="MaterialDesignTitleTextBlock">
20+
<Setter Property="FontSize" Value="20"/>
21+
<Setter Property="FontWeight" Value="Medium"/>
22+
</Style>
23+
<Style TargetType="{x:Type TextBlock}" x:Key="MaterialDesignHeadlineTextBlock">
24+
<Setter Property="FontSize" Value="24"/>
25+
<Setter Property="FontWeight" Value="Regular"/>
26+
</Style>
27+
<Style TargetType="{x:Type TextBlock}" x:Key="MaterialDesignDisplay1TextBlock">
28+
<Setter Property="FontSize" Value="34"/>
29+
<Setter Property="FontWeight" Value="Regular"/>
30+
</Style>
31+
<Style TargetType="{x:Type TextBlock}" x:Key="MaterialDesignDisplay2TextBlock">
32+
<Setter Property="FontSize" Value="45"/>
33+
<Setter Property="FontWeight" Value="Regular"/>
34+
</Style>
35+
<Style TargetType="{x:Type TextBlock}" x:Key="MaterialDesignDisplay3TextBlock">
36+
<Setter Property="FontSize" Value="56"/>
37+
<Setter Property="FontWeight" Value="Regular"/>
38+
</Style>
39+
<Style TargetType="{x:Type TextBlock}" x:Key="MaterialDesignDisplay4TextBlock">
40+
<Setter Property="FontSize" Value="112"/>
41+
<Setter Property="FontWeight" Value="Regular"/>
42+
</Style>
43+
</ResourceDictionary>

0 commit comments

Comments
 (0)