Browse Source

Merge branch 'master' into feature/relative-panel

pull/3987/head
Dan Walmsley 6 years ago
parent
commit
6a25391203
  1. 2
      src/Avalonia.Themes.Fluent/Accents/Base.xaml
  2. BIN
      src/Avalonia.Themes.Fluent/Assets/Lato-Black.ttf
  3. BIN
      src/Avalonia.Themes.Fluent/Assets/Lato-Bold.ttf
  4. BIN
      src/Avalonia.Themes.Fluent/Assets/Lato-Hairline.ttf
  5. BIN
      src/Avalonia.Themes.Fluent/Assets/Lato-Heavy.ttf
  6. BIN
      src/Avalonia.Themes.Fluent/Assets/Lato-Italic.ttf
  7. BIN
      src/Avalonia.Themes.Fluent/Assets/Lato-Light.ttf
  8. BIN
      src/Avalonia.Themes.Fluent/Assets/Lato-Medium.ttf
  9. BIN
      src/Avalonia.Themes.Fluent/Assets/Lato-Regular.ttf
  10. BIN
      src/Avalonia.Themes.Fluent/Assets/Lato-Semibold.ttf
  11. BIN
      src/Avalonia.Themes.Fluent/Assets/Lato-Thin.ttf
  12. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-Bold.ttf
  13. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-BoldItalic.ttf
  14. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBold.ttf
  15. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBoldItalic.ttf
  16. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-Italic.ttf
  17. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-Light.ttf
  18. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-LightItalic.ttf
  19. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-Regular.ttf
  20. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBold.ttf
  21. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBoldItalic.ttf
  22. 13
      src/Avalonia.Themes.Fluent/Button.xaml

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

@ -12,7 +12,7 @@
<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#Open Sans</FontFamily>
<FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Themes.Fluent/Assets#Lato</FontFamily>
<sys:Double x:Key="ControlContentThemeFontSize">13</sys:Double>
<SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
src/Avalonia.Themes.Fluent/Assets/OpenSans-BoldItalic.ttf

Binary file not shown.

BIN
src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBold.ttf

Binary file not shown.

BIN
src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBoldItalic.ttf

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
src/Avalonia.Themes.Fluent/Assets/OpenSans-LightItalic.ttf

Binary file not shown.

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

Binary file not shown.

BIN
src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBold.ttf

Binary file not shown.

BIN
src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBoldItalic.ttf

Binary file not shown.

13
src/Avalonia.Themes.Fluent/Button.xaml

@ -77,6 +77,19 @@
<Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" />
</Style>
<Style Selector="Button">
<Setter Property="RenderTransform" Value="none" />
<Setter Property="Transitions">
<Transitions>
<TransformOperationsTransition Property="RenderTransform" Duration="0:0:.15" />
</Transitions>
</Setter>
</Style>
<Style Selector="Button:pressed">
<Setter Property="RenderTransform" Value="scale(0.98)" />
</Style>
<Style Selector="Button.accent:disabled /template/ ContentPresenter">
<Setter Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
<Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />

Loading…
Cancel
Save