Browse Source
Merge pull request #4388 from rstm-sf/bugfix/revert_colors_changed_default
Reverts changes using style resource for default theme
pull/4394/head
Benedikt Stebner
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
7 deletions
-
src/Avalonia.Themes.Default/TitleBar.xaml
-
src/Avalonia.Themes.Default/Window.xaml
|
|
|
@ -5,7 +5,7 @@ |
|
|
|
</Border> |
|
|
|
</Design.PreviewWith> |
|
|
|
<Style Selector="TitleBar"> |
|
|
|
<Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/> |
|
|
|
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/> |
|
|
|
<Setter Property="VerticalAlignment" Value="Top" /> |
|
|
|
<Setter Property="HorizontalAlignment" Value="Stretch" /> |
|
|
|
<Setter Property="Background" Value="Transparent" /> |
|
|
|
@ -23,7 +23,7 @@ |
|
|
|
</Style> |
|
|
|
|
|
|
|
<Style Selector="TitleBar:fullscreen"> |
|
|
|
<Setter Property="Background" Value="{DynamicResource SystemAccentColor}" /> |
|
|
|
<Setter Property="Background" Value="{DynamicResource ThemeAccentColor}" /> |
|
|
|
</Style> |
|
|
|
|
|
|
|
<Style Selector="TitleBar /template/ Border#PART_Background"> |
|
|
|
|
|
|
|
@ -1,9 +1,8 @@ |
|
|
|
<Style xmlns="https://github.com/avaloniaui" Selector="Window"> |
|
|
|
<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/> |
|
|
|
<Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" /> |
|
|
|
<Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/> |
|
|
|
<Setter Property="FontSize" Value="{DynamicResource ContentControlFontSize}"/> |
|
|
|
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" /> |
|
|
|
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/> |
|
|
|
<Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource HighlightForegroundColor}" /> |
|
|
|
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/> |
|
|
|
<Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}"/> |
|
|
|
<Setter Property="Template"> |
|
|
|
<ControlTemplate> |
|
|
|
<Panel> |
|
|
|
|
