From ab97dbb12c87f2188eebd8bd22add64c6464ef81 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Thu, 6 Sep 2018 20:28:20 +0200
Subject: [PATCH] Selector rework

---
 samples/ControlCatalog/SideBar.xaml      |  5 ++---
 src/Avalonia.Themes.Default/TabItem.xaml | 16 +++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/samples/ControlCatalog/SideBar.xaml b/samples/ControlCatalog/SideBar.xaml
index dbab4e4a27..3552f224fc 100644
--- a/samples/ControlCatalog/SideBar.xaml
+++ b/samples/ControlCatalog/SideBar.xaml
@@ -39,7 +39,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="TabControl.sidebar > TabItem">
+    <Style Selector="TabControl.sidebar > TabItem">       
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Foreground" Value="White"/>
         <Setter Property="FontSize" Value="14"/>
@@ -52,11 +52,10 @@
             </Transitions>
         </Setter>
     </Style>
-
     <Style Selector="TabControl.sidebar > TabItem:pointerover">
+        <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Opacity" Value="1"/>
     </Style>
-
     <Style Selector="TabControl.sidebar > TabItem:selected">
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
         <Setter Property="Opacity" Value="1"/>
diff --git a/src/Avalonia.Themes.Default/TabItem.xaml b/src/Avalonia.Themes.Default/TabItem.xaml
index 311fb2b973..b51d1426ef 100644
--- a/src/Avalonia.Themes.Default/TabItem.xaml
+++ b/src/Avalonia.Themes.Default/TabItem.xaml
@@ -1,6 +1,8 @@
 <Styles xmlns="https://github.com/avaloniaui">
     <Style Selector="TabItem">
         <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLightBrush}"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Padding" Value="2 1"/>
@@ -23,23 +25,19 @@
     <Style Selector="TabItem:disabled">
         <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
     </Style>
-    <Style Selector="TabItem:pointerover /template/ContentPresenter">
+    <Style Selector="TabItem:pointerover">
         <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
     </Style>
-
-    <Style Selector="TabItem:selected /template/ContentPresenter">
+    <Style Selector="TabItem:selected">
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
     </Style>
-
-    <Style Selector="TabItem:selected:focus /template/ContentPresenter">
+    <Style Selector="TabItem:selected:focus">
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
     </Style>
-
-    <Style Selector="ListBoxItem:selected:pointerover /template/ContentPresenter">
+    <Style Selector="TabItem:selected:pointerover">
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
     </Style>
-
-    <Style Selector="ListBoxItem:selected:focus:pointerover /template/ContentPresenter">
+    <Style Selector="TabItem:selected:focus:pointerover">
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
     </Style>
 </Styles>