From 3353d7aa519508d89a7794cd85c7d79b4f5923ff Mon Sep 17 00:00:00 2001
From: Yan Maniez <yan.maniez@atos.net>
Date: Wed, 11 Sep 2019 15:14:46 +0200
Subject: [PATCH] =?UTF-8?q?Suppression=20styles=20probl=C3=A9matiques=20av?=
 =?UTF-8?q?ec=20XF=20vNext?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AideDeJeu/AideDeJeu/App.xaml                  | 22 +++++++++----------
 .../Views/Library/BookmarksPage.xaml          |  5 +++--
 .../Views/Library/DeepSearchPage.xaml         |  5 +++--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/App.xaml b/AideDeJeu/AideDeJeu/App.xaml
index e061c999..4b72c4ca 100644
--- a/AideDeJeu/AideDeJeu/App.xaml
+++ b/AideDeJeu/AideDeJeu/App.xaml
@@ -101,61 +101,61 @@
 
             <!-- MarkdownView -->
 
-            <Style TargetType="Label"  x:Key="paragraph">
+            <Style TargetType="Label"  x:Key="paragraph" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="15" />
                 <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
                 <Setter Property="FontFamily" Value="serif" />
             </Style>
 
-            <Style TargetType="Label"  x:Key="heading1">
+            <Style TargetType="Label"  x:Key="heading1" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="30" />
                 <Setter Property="TextColor" Value="{StaticResource HDRed}" />
                 <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitalsBold}" />
                 <Setter Property="FontAttributes" Value="Bold" />
             </Style>
 
-            <Style TargetType="Label"  x:Key="heading2">
+            <Style TargetType="Label"  x:Key="heading2" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="25" />
                 <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
                 <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
                 <Setter Property="FontAttributes" Value="Bold" />
             </Style>
 
-            <Style TargetType="Label"  x:Key="heading3">
+            <Style TargetType="Label"  x:Key="heading3" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="20" />
                 <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
                 <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
                 <Setter Property="FontAttributes" Value="Bold" />
             </Style>
 
-            <Style TargetType="Label"  x:Key="heading4">
+            <Style TargetType="Label"  x:Key="heading4" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="18" />
                 <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
                 <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
                 <Setter Property="FontAttributes" Value="Bold" />
             </Style>
 
-            <Style TargetType="Label"  x:Key="heading5">
+            <Style TargetType="Label"  x:Key="heading5" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="16" />
                 <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
                 <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
                 <Setter Property="FontAttributes" Value="Bold" />
             </Style>
 
-            <Style TargetType="Label"  x:Key="heading6">
+            <Style TargetType="Label"  x:Key="heading6" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="15" />
                 <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
                 <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
                 <Setter Property="FontAttributes" Value="Bold" />
             </Style>
 
-            <Style TargetType="Label"  x:Key="link">
+            <Style TargetType="Label"  x:Key="link" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="15" />
                 <Setter Property="TextColor" Value="{StaticResource HDBlue}" />
                 <Setter Property="FontFamily" Value="serif" />
             </Style>
 
-            <Style TargetType="Label"  x:Key="tableheader">
+            <Style TargetType="Label"  x:Key="tableheader" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="12" />
                 <Setter Property="Margin" Value="1" />
                 <Setter Property="TextColor" Value="{StaticResource HDWhite}" />
@@ -164,7 +164,7 @@
                 <Setter Property="FontAttributes" Value="Bold" />
             </Style>
 
-            <Style TargetType="Label"  x:Key="tablecell">
+            <Style TargetType="Label"  x:Key="tablecell" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="12" />
                 <Setter Property="Margin" Value="1" />
                 <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
@@ -172,7 +172,7 @@
                 <Setter Property="FontFamily" Value="serif" />
             </Style>
 
-            <Style TargetType="Label"  x:Key="tablecellalt">
+            <Style TargetType="Label"  x:Key="tablecellalt" ApplyToDerivedTypes="True">
                 <Setter Property="FontSize" Value="12" />
                 <Setter Property="Margin" Value="1" />
                 <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
diff --git a/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml
index 6b4079d5..a43deeee 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml
@@ -28,8 +28,9 @@
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
-            <Picker x:Name="BookmarkCollectionPicker" Grid.Column="0" Grid.Row="0" Style="{StaticResource heading1}" HorizontalOptions="Fill" ItemsSource="{Binding BookmarkCollectionNames, Mode=OneWay}" ItemDisplayBinding="{Binding Mode=OneWay}" SelectedIndex="{Binding BookmarkCollectionIndex, Mode=TwoWay}">
-                <Picker.Behaviors>
+            <Picker x:Name="BookmarkCollectionPicker" Grid.Column="0" Grid.Row="0" HorizontalOptions="Fill" ItemsSource="{Binding BookmarkCollectionNames, Mode=OneWay}" ItemDisplayBinding="{Binding Mode=OneWay}" SelectedIndex="{Binding BookmarkCollectionIndex, Mode=TwoWay}">
+              <!--Style="{StaticResource heading1}"-->
+              <Picker.Behaviors>
                     <tools:EventToCommandBehavior EventName="SelectedIndexChanged" Command="{Binding BindingContext.SelectedIndexChangedCommand, Source={x:Reference This}}" />
                 </Picker.Behaviors>
             </Picker>
diff --git a/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml
index 8e8e44ca..71843c11 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml
@@ -21,8 +21,9 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <SearchBar Style="{StaticResource heading3}"  Grid.Column="0" Grid.Row="0" x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
-                <!--<SearchBar.Behaviors>
+            <SearchBar  Grid.Column="0" Grid.Row="0" x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
+              <!--Style="{StaticResource heading3}"-->
+              <!--<SearchBar.Behaviors>
                     <tools:TextChangedBehavior />
                 </SearchBar.Behaviors>-->
             </SearchBar>