Browse Source
Merge branch 'master' into feature/fluent-combobox
pull/4019/head
danwalmsley
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
0 deletions
-
src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
-
src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
-
src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml
|
|
|
@ -161,6 +161,7 @@ |
|
|
|
<x:Double x:Key="AppBarThemeMinimalHeight">24</x:Double> |
|
|
|
<x:Double x:Key="AppBarThemeCompactHeight">40</x:Double> |
|
|
|
<x:Double x:Key="AppBarExpandButtonCircleDiameter">3</x:Double> |
|
|
|
<x:Double x:Key="AutoCompleteListMaxHeight">374</x:Double> |
|
|
|
<x:Double x:Key="AutoCompleteListBorderOpacity">0</x:Double> |
|
|
|
<Thickness x:Key="CheckBoxBorderThemeThickness">2</Thickness> |
|
|
|
<Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness> |
|
|
|
|
|
|
|
@ -160,6 +160,7 @@ |
|
|
|
<x:Double x:Key="AppBarThemeMinimalHeight">24</x:Double> |
|
|
|
<x:Double x:Key="AppBarThemeCompactHeight">40</x:Double> |
|
|
|
<x:Double x:Key="AppBarExpandButtonCircleDiameter">3</x:Double> |
|
|
|
<x:Double x:Key="AutoCompleteListMaxHeight">374</x:Double> |
|
|
|
<x:Double x:Key="AutoCompleteListBorderOpacity">0</x:Double> |
|
|
|
<Thickness x:Key="CheckBoxBorderThemeThickness">2</Thickness> |
|
|
|
<Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness> |
|
|
|
|
|
|
|
@ -26,6 +26,7 @@ |
|
|
|
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" /> |
|
|
|
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" /> |
|
|
|
<Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" /> |
|
|
|
<Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteListMaxHeight}" /> |
|
|
|
<Setter Property="Template"> |
|
|
|
<ControlTemplate> |
|
|
|
<Grid Name="PART_LayoutRoot"> |
|
|
|
|