Browse Source

Merge branch 'master' into compiled-bindings-inherited-interfaces

danwalmsley 5 years ago
parent
commit
e25d65be6c

+ 2 - 2
src/Avalonia.Themes.Fluent/Accents/Base.xaml

@@ -12,8 +12,8 @@
     <Color x:Key="SystemColorHotlight">#FF0066CC</Color>
     <Color x:Key="SystemColorWindow">#FFFFFFFF</Color>
     <Color x:Key="SystemColorWindowText">#FF000000</Color>
-    <FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Themes.Fluent/Assets#Lato</FontFamily>
-    <sys:Double x:Key="ControlContentThemeFontSize">13</sys:Double>
+    <FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Themes.Fluent/Assets#Roboto</FontFamily>
+    <sys:Double x:Key="ControlContentThemeFontSize">14</sys:Double>
 
     <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
     <x:Boolean x:Key="UseSystemFocusVisuals">True</x:Boolean>

BIN
src/Avalonia.Themes.Fluent/Assets/Lato-Black.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Lato-Bold.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Lato-Hairline.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Lato-Heavy.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Lato-Italic.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Lato-Light.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Lato-Medium.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Lato-Regular.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Lato-Semibold.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Lato-Thin.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Roboto-Black.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Roboto-Bold.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Roboto-Light.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Roboto-Medium.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Roboto-Regular.ttf


BIN
src/Avalonia.Themes.Fluent/Assets/Roboto-Thin.ttf


+ 1 - 1
src/Avalonia.Themes.Fluent/Button.xaml

@@ -81,7 +81,7 @@
     <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Transitions">
       <Transitions>
-        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.15" />
+        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
       </Transitions>
     </Setter>
   </Style>