Skip to content

Commit a83ada8

Browse files
committed
MahApps.Sizes.Font -> MahApps.Font.Size
1 parent de9892b commit a83ada8

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

src/MahApps.Metro/Styles/Fonts.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<FontFamily x:Key="MahApps.Fonts.Family.Default.Mui">Segoe UI</FontFamily>
4343
<FontFamily x:Key="MahApps.Fonts.Family.Fixed.Mui">Consolas</FontFamily>
4444

45-
<System:Double x:Key="MahApps.Sizes.Font.Default.Mui">13</System:Double>
46-
<System:Double x:Key="MahApps.Sizes.Font.Fixed.Mui">13.333</System:Double>
47-
<System:Double x:Key="MahApps.Sizes.Font.Small.Mui">11</System:Double>
45+
<System:Double x:Key="MahApps.Font.Size.Default.Mui">13</System:Double>
46+
<System:Double x:Key="MahApps.Font.Size.Fixed.Mui">13.333</System:Double>
47+
<System:Double x:Key="MahApps.Font.Size.Small.Mui">11</System:Double>
4848

4949
</ResourceDictionary>

src/MahApps.Metro/Styles/MUI/Calendar.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<ControlTemplate.Resources>
3535
<DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
3636
<TextBlock x:Name="Text" FontWeight="Bold"
37-
FontSize="{DynamicResource MahApps.Sizes.Font.Default.Mui}"
37+
FontSize="{DynamicResource MahApps.Font.Size.Default.Mui}"
3838
Foreground="{DynamicResource MahApps.Brushes.ItemText.Mui}"
3939
HorizontalAlignment="Center"
4040
Text="{Binding}"
@@ -154,7 +154,7 @@
154154
<Style x:Key="MahApps.Styles.CalendarDayButton.Mui" TargetType="CalendarDayButton" >
155155
<Setter Property="MinWidth" Value="5"/>
156156
<Setter Property="MinHeight" Value="5"/>
157-
<Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
157+
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}"/>
158158
<Setter Property="HorizontalContentAlignment" Value="Center"/>
159159
<Setter Property="VerticalContentAlignment" Value="Center"/>
160160
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
@@ -218,7 +218,7 @@
218218
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}" />
219219
<Setter Property="MinWidth" Value="40"/>
220220
<Setter Property="MinHeight" Value="42"/>
221-
<Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
221+
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}"/>
222222
<Setter Property="HorizontalContentAlignment" Value="Center"/>
223223
<Setter Property="VerticalContentAlignment" Value="Center"/>
224224
<Setter Property="FocusVisualStyle" Value="{x:Null}" />

src/MahApps.Metro/Styles/MUI/ContextMenu.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<Style x:Key="MahApps.Styles.ContextMenu.Mui" TargetType="{x:Type ContextMenu}">
55
<Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}"/>
6-
<Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
6+
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}" />
77
<Setter Property="TextOptions.TextFormattingMode" Value="Display" />
88
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}" />
99
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>

src/MahApps.Metro/Styles/MUI/DataGrid.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<Setter Property="BorderThickness" Value="0" />
183183
<Setter Property="FontWeight" Value="Bold" />
184184
<Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}" />
185-
<Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
185+
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}" />
186186
<Setter Property="Padding" Value="4,3,4,3"/>
187187
<Setter Property="HorizontalContentAlignment" Value="Center" />
188188
<Setter Property="VerticalContentAlignment" Value="Center" />

src/MahApps.Metro/Styles/MUI/TextBlock.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@
2222

2323
<Style x:Key="MahApps.Styles.TextBlock.Small.Mui" TargetType="TextBlock">
2424
<Setter Property="FontFamily" Value="Segoe UI" />
25-
<Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
25+
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Small.Mui}"/>
2626
<Setter Property="TextOptions.TextFormattingMode" Value="Display" />
2727
</Style>
2828

2929
<Style x:Key="MahApps.Styles.TextBlock.Emphasis.Mui" TargetType="TextBlock">
3030
<Setter Property="FontFamily" Value="Segoe UI" />
31-
<Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
31+
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Small.Mui}"/>
3232
<Setter Property="FontWeight" Value="Bold" />
3333
<Setter Property="TextOptions.TextFormattingMode" Value="Display" />
3434
</Style>
3535

3636
<Style x:Key="MahApps.Styles.TextBlock.Fixed.Mui" TargetType="TextBlock">
3737
<Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Fixed.Mui}" />
38-
<Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Fixed.Mui}"/>
38+
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Fixed.Mui}"/>
3939
<Setter Property="TextOptions.TextFormattingMode" Value="Display" />
4040
</Style>
4141

src/MahApps.Metro/Styles/MUI/Tooltip.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}"/>
88
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
99
<Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}"/>
10-
<Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
10+
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}"/>
1111
<Setter Property="FontStyle" Value="Normal"/>
1212
<Setter Property="FontWeight" Value="Normal"/>
1313
<Setter Property="Padding" Value="5,1,5,4"/>

0 commit comments

Comments
 (0)