button 的样式 都用 FontFamily.Field

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/ButtonStyle2.xaml

@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     >
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Colors2.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/BaseStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
     <!--空按钮-->
     <Style TargetType="Button" x:Key="Styles.Button.Empty">
@@ -41,7 +41,7 @@
         <Setter Property="Foreground" Value="#FFFFFFFF" />
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="FontSize" Value="36" />
-        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
+        <Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
         <Setter Property="Background" Value="#FF3B3B3B" />
         <Setter Property="Template">
             <Setter.Value>
@@ -71,7 +71,7 @@
         <Setter Property="Foreground" Value="#FFFFFFFF" />
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="FontSize" Value="48" />
-        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
+        <Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
         <Setter Property="Background" Value="#FF3B3B3B" />
         <Setter Property="Template">
             <Setter.Value>
@@ -104,7 +104,7 @@
         <Setter Property="Foreground" Value="#FFFFFFFF" />
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="FontSize" Value="48" />
-        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
+        <Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
         <Setter Property="Background" Value="#FF3B3B3B" />
         <Setter Property="Template">
             <Setter.Value>
@@ -176,6 +176,7 @@
 
     <Style x:Key="Styles.Button.Square.Accent2" TargetType="Button" BasedOn="{StaticResource MahApps.Styles.Button.Square.Accent}" >
         <Setter Property="FontSize" Value="18"/>
+        <Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
         <Setter Property="Width" Value="120"/>
         <Setter Property="Height" Value="40"/>
         <Setter Property="Margin" Value="5"/>
@@ -183,6 +184,7 @@
     
     <Style x:Key="Styles.Button.Square2" TargetType="Button" BasedOn="{StaticResource MahApps.Styles.Button.Square}" >
         <Setter Property="FontSize" Value="18"/>
+        <Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
         <Setter Property="Width" Value="120"/>
         <Setter Property="Height" Value="40"/>
         <Setter Property="Margin" Value="5"/>