MahApps.Sizes.Font -> MahApps.Font.Size

MahApps · Dec 27, 2019 · 0e111cf · 0e111cf
1 parent 089d4ae
commit 0e111cf
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/MahApps.Metro/Styles/Fonts.xaml b/src/MahApps.Metro/Styles/Fonts.xaml
@@ -42,8 +42,8 @@
     <FontFamily x:Key="MahApps.Fonts.Family.Default.Mui">Segoe UI</FontFamily>
     <FontFamily x:Key="MahApps.Fonts.Family.Fixed.Mui">Consolas</FontFamily>
 
-    <System:Double x:Key="MahApps.Sizes.Font.Default.Mui">13</System:Double>
-    <System:Double x:Key="MahApps.Sizes.Font.Fixed.Mui">13.333</System:Double>
-    <System:Double x:Key="MahApps.Sizes.Font.Small.Mui">11</System:Double>
+    <System:Double x:Key="MahApps.Font.Size.Default.Mui">13</System:Double>
+    <System:Double x:Key="MahApps.Font.Size.Fixed.Mui">13.333</System:Double>
+    <System:Double x:Key="MahApps.Font.Size.Small.Mui">11</System:Double>
 
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/MUI/Calendar.xaml b/src/MahApps.Metro/Styles/MUI/Calendar.xaml
@@ -34,7 +34,7 @@
                     <ControlTemplate.Resources>
                         <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
                             <TextBlock x:Name="Text" FontWeight="Bold"
-                                       FontSize="{DynamicResource MahApps.Sizes.Font.Default.Mui}"
+                                       FontSize="{DynamicResource MahApps.Font.Size.Default.Mui}"
                                        Foreground="{DynamicResource MahApps.Brushes.ItemText.Mui}"
                                        HorizontalAlignment="Center"
                                        Text="{Binding}"
@@ -154,7 +154,7 @@
     <Style x:Key="MahApps.Styles.CalendarDayButton.Mui" TargetType="CalendarDayButton" >
         <Setter Property="MinWidth" Value="5"/>
         <Setter Property="MinHeight" Value="5"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
@@ -218,7 +218,7 @@
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ButtonText.Mui}" />
         <Setter Property="MinWidth" Value="40"/>
         <Setter Property="MinHeight" Value="42"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />

diff --git a/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml b/src/MahApps.Metro/Styles/MUI/ContextMenu.xaml
@@ -3,7 +3,7 @@
 
     <Style x:Key="MahApps.Styles.ContextMenu.Mui" TargetType="{x:Type ContextMenu}">
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ItemText.Mui}"/>

diff --git a/src/MahApps.Metro/Styles/MUI/DataGrid.xaml b/src/MahApps.Metro/Styles/MUI/DataGrid.xaml
@@ -182,7 +182,7 @@
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}" />
         <Setter Property="Padding" Value="4,3,4,3"/>
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />

diff --git a/src/MahApps.Metro/Styles/MUI/TextBlock.xaml b/src/MahApps.Metro/Styles/MUI/TextBlock.xaml
@@ -22,20 +22,20 @@
 
     <Style x:Key="MahApps.Styles.TextBlock.Small.Mui" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Small.Mui}"/>
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBlock.Emphasis.Mui" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Small.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Small.Mui}"/>
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBlock.Fixed.Mui" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Fixed.Mui}" />
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Fixed.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Fixed.Mui}"/>
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 

diff --git a/src/MahApps.Metro/Styles/MUI/Tooltip.xaml b/src/MahApps.Metro/Styles/MUI/Tooltip.xaml
@@ -7,7 +7,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WindowBackground.Mui}"/>
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Default.Mui}"/>
-        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Default.Mui}"/>
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Default.Mui}"/>
         <Setter Property="FontStyle" Value="Normal"/>
         <Setter Property="FontWeight" Value="Normal"/>
         <Setter Property="Padding" Value="5,1,5,4"/>