Browse Source
Merge pull request #2496 from Gillibald/fixes/StylableTabItem
Fix TabItem styling
revert-2489-fixes/2432-carousel-insert
Jumar Macato
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
7 deletions
-
samples/ControlCatalog/SideBar.xaml
-
src/Avalonia.Themes.Default/TabItem.xaml
|
|
|
@ -63,13 +63,13 @@ |
|
|
|
<Style Selector="TabControl.sidebar > TabItem:pointerover"> |
|
|
|
<Setter Property="Opacity" Value="1"/> |
|
|
|
</Style> |
|
|
|
<Style Selector="TabControl.sidebar > TabItem:pointerover /template/ ContentPresenter#PART_ContentPresenter"> |
|
|
|
<Style Selector="TabControl.sidebar > TabItem:pointerover"> |
|
|
|
<Setter Property="Background" Value="Transparent"/> |
|
|
|
</Style> |
|
|
|
<Style Selector="TabControl.sidebar > TabItem:selected"> |
|
|
|
<Setter Property="Opacity" Value="1"/> |
|
|
|
</Style> |
|
|
|
<Style Selector="TabControl.sidebar > TabItem:selected /template/ ContentPresenter#PART_ContentPresenter"> |
|
|
|
<Style Selector="TabControl.sidebar > TabItem:selected"> |
|
|
|
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/> |
|
|
|
</Style> |
|
|
|
</Styles> |
|
|
|
|
|
|
|
@ -24,19 +24,19 @@ |
|
|
|
<Style Selector="TabItem:disabled"> |
|
|
|
<Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/> |
|
|
|
</Style> |
|
|
|
<Style Selector="TabItem:pointerover /template/ ContentPresenter#PART_ContentPresenter"> |
|
|
|
<Style Selector="TabItem:pointerover"> |
|
|
|
<Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/> |
|
|
|
</Style> |
|
|
|
<Style Selector="TabItem:selected /template/ ContentPresenter#PART_ContentPresenter"> |
|
|
|
<Style Selector="TabItem:selected"> |
|
|
|
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/> |
|
|
|
</Style> |
|
|
|
<Style Selector="TabItem:selected:focus /template/ ContentPresenter#PART_ContentPresenter"> |
|
|
|
<Style Selector="TabItem:selected:focus"> |
|
|
|
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/> |
|
|
|
</Style> |
|
|
|
<Style Selector="TabItem:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter"> |
|
|
|
<Style Selector="TabItem:selected:pointerover"> |
|
|
|
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/> |
|
|
|
</Style> |
|
|
|
<Style Selector="TabItem:selected:focus:pointerover /template/ ContentPresenter#PART_ContentPresenter"> |
|
|
|
<Style Selector="TabItem:selected:focus:pointerover"> |
|
|
|
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/> |
|
|
|
</Style> |
|
|
|
<Style Selector="TabItem[TabStripPlacement=Right]"> |
|
|
|
|
