Browse Source

Deal with some another missed resources

pull/4228/head
Maksym Katsydan 6 years ago
parent
commit
8c44474aa2
  1. 2
      src/Avalonia.Themes.Fluent/ContextMenu.xaml
  2. 4
      src/Avalonia.Themes.Fluent/EmbeddableControlRoot.xaml
  3. 4
      src/Avalonia.Themes.Fluent/Expander.xaml
  4. 3
      src/Avalonia.Themes.Fluent/FluentTheme.xaml
  5. 4
      src/Avalonia.Themes.Fluent/GridSplitter.xaml
  6. 3
      src/Avalonia.Themes.Fluent/ListBox.xaml
  7. 2
      src/Avalonia.Themes.Fluent/OverlayPopupHost.xaml
  8. 1
      src/Avalonia.Themes.Fluent/TextBox.xaml

2
src/Avalonia.Themes.Fluent/ContextMenu.xaml

@ -35,7 +35,7 @@
<Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
<Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="TextBlock.FontSize" Value="{DynamicResource FontSizeNormal}" />
<Setter Property="TextBlock.FontSize" Value="{DynamicResource ContentControlFontSize}" />
<Setter Property="TextBlock.FontWeight" Value="Normal" />
<Setter Property="Template">
<ControlTemplate>

4
src/Avalonia.Themes.Fluent/EmbeddableControlRoot.xaml

@ -1,6 +1,6 @@
<Style xmlns="https://github.com/avaloniaui" Selector="EmbeddableControlRoot">
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
<Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
<Setter Property="FontSize" Value="{DynamicResource ContentControlFontSize}"/>
<Setter Property="Template">
<ControlTemplate>
<Panel>

4
src/Avalonia.Themes.Fluent/Expander.xaml

@ -89,7 +89,7 @@
<Border BorderThickness="1">
<Grid ColumnDefinitions="Auto,Auto">
<Border Grid.Column="0" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center">
<Path Fill="{DynamicResource ThemeForegroundBrush}"
<Path Fill="{DynamicResource SystemControlForegroundAltMediumHighBrush}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="M 0 2 L 4 6 L 0 10 Z" />
@ -108,7 +108,7 @@
</Setter>
</Style>
<Style Selector="Expander /template/ ToggleButton#PART_toggle:pointerover /template/ Border">
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource SystemControlTransientBorderBrush}" />
</Style>
<Style Selector="Expander:down:expanded /template/ ToggleButton#PART_toggle /template/ Path">
<Setter Property="RenderTransform">

3
src/Avalonia.Themes.Fluent/FluentTheme.xaml

@ -57,4 +57,7 @@
<StyleInclude Source="avares://Avalonia.Themes.Fluent/SplitView.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/DatePicker.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/TimePicker.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/ColorPicker.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/ColorPickerSlider.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/ColorSpectrum.xaml"/>
</Styles>

4
src/Avalonia.Themes.Fluent/GridSplitter.xaml

@ -4,10 +4,10 @@
<Setter Property="Focusable" Value="True" />
<Setter Property="MinWidth" Value="6" />
<Setter Property="MinHeight" Value="6" />
<Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
<Setter Property="Background" Value="{DynamicResource SystemAltMediumLowColor}" />
<Setter Property="PreviewContent">
<Template>
<Rectangle Fill="{DynamicResource HighlightBrush}" />
<Rectangle Fill="{DynamicResource SystemAccentColor}" />
</Template>
</Setter>
<Setter Property="Template">

3
src/Avalonia.Themes.Fluent/ListBox.xaml

@ -36,7 +36,4 @@
</ControlTemplate>
</Setter>
</Style>
<Style Selector="ListBox:disabled /template/ Border#border">
<Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
</Style>
</Styles>

2
src/Avalonia.Themes.Fluent/OverlayPopupHost.xaml

@ -1,5 +1,5 @@
<Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost">
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
<Setter Property="Template">
<ControlTemplate>
<Panel>

1
src/Avalonia.Themes.Fluent/TextBox.xaml

@ -102,7 +102,6 @@
</Style>
<Style Selector="TextBox:disabled /template/ Border#border">
<Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
<Setter Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
</Style>

Loading…
Cancel
Save