Browse Source

use opensans and correct corner radii

pull/4233/head
Dan Walmsley 6 years ago
parent
commit
5781336dfa
  1. 4
      samples/ControlCatalog/Pages/ButtonPage.xaml
  2. 4
      src/Avalonia.Themes.Fluent/Accents/Base.xaml
  3. 4
      src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
  4. 4
      src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
  5. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-Bold.ttf
  6. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-BoldItalic.ttf
  7. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBold.ttf
  8. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBoldItalic.ttf
  9. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-Italic.ttf
  10. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-Light.ttf
  11. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-LightItalic.ttf
  12. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-Regular.ttf
  13. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBold.ttf
  14. BIN
      src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBoldItalic.ttf
  15. 5
      src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj

4
samples/ControlCatalog/Pages/ButtonPage.xaml

@ -9,8 +9,8 @@
Margin="0,16,0,0" Margin="0,16,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Spacing="16"> Spacing="16">
<StackPanel Orientation="Vertical" Spacing="8" Width="150"> <StackPanel Orientation="Vertical" Spacing="8" Width="200">
<Button>Button</Button> <Button>Standard XAML Button</Button>
<Button Foreground="White">Foreground</Button> <Button Foreground="White">Foreground</Button>
<Button Background="{DynamicResource ThemeAccentBrush}">Background</Button> <Button Background="{DynamicResource ThemeAccentBrush}">Background</Button>
<Button IsEnabled="False">Disabled</Button> <Button IsEnabled="False">Disabled</Button>

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

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

4
src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml

@ -11,8 +11,8 @@
<SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" /> <SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" />
<!-- Override system shape defaults --> <!-- Override system shape defaults -->
<CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius> <CornerRadius x:Key="ControlCornerRadius">3</CornerRadius>
<CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius> <CornerRadius x:Key="OverlayCornerRadius">5</CornerRadius>
<!-- Override system borders --> <!-- Override system borders -->
<Thickness x:Key="MenuBarItemBorderThickness">1,1,1,1</Thickness> <Thickness x:Key="MenuBarItemBorderThickness">1,1,1,1</Thickness>

4
src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml

@ -11,8 +11,8 @@
<SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" /> <SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" />
<!-- Override system shape defaults --> <!-- Override system shape defaults -->
<CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius> <CornerRadius x:Key="ControlCornerRadius">3</CornerRadius>
<CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius> <CornerRadius x:Key="OverlayCornerRadius">5</CornerRadius>
<!-- Override system borders --> <!-- Override system borders -->
<Thickness x:Key="MenuBarItemBorderThickness">1,1,1,1</Thickness> <Thickness x:Key="MenuBarItemBorderThickness">1,1,1,1</Thickness>

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.

5
src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj

@ -13,9 +13,8 @@
<ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" /> <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
<ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" /> <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
<AvaloniaResource Include="**/*.xaml" /> <AvaloniaResource Include="**/*.xaml" />
<AvaloniaResource Include="Assets\*" /> <AvaloniaResource Include="Assets\*" />
</ItemGroup>
</ItemGroup> </ItemGroup>
<Import Project="..\..\build\BuildTargets.targets" /> <Import Project="..\..\build\BuildTargets.targets" />
<Import Project="..\..\build\Rx.props" /> <Import Project="..\..\build\Rx.props" />
</Project> </Project>

Loading…
Cancel
Save