push with conflitc

Qwirkle/Qwirkle/Pages/Credits.xaml

@@ -20,28 +20,19 @@
 
             <Label
                     Text="Line-UP : "
-                    FontSize="30"
-                    FontAttributes="Bold"
-                    Padding="10"
-                    HorizontalOptions="Center" />
+                    Style="{StaticResource SubTitle}"/>
             <Label
                     Text="Jules Lascret"
-                    FontSize="20"
-                    HorizontalOptions="Center" />
+                    Style="{StaticResource Content}"/>
             <Label
                     Text="Rémy Portet"
-                    FontSize="20"
-                    HorizontalOptions="Center" />
+                    Style="{StaticResource Content}"/>
             <Label
                     Text="Jérémy Mouyon (Project leader)"
-                    FontSize="20"
-                    HorizontalOptions="Center" />
+                    Style="{StaticResource Content}"/>
             <Label
                     Text="Merci à l'IUT Informatique de l'université de Clermont-Auvernge pour nous avoir permis de realiser ce projet."
-                    FontSize="20"
-                    Padding="75"
-                    FontAttributes="Bold"
-                    HorizontalOptions="Center" />
+                    Style="{StaticResource SubTitle}"/>
             <Image
                 Source="uca.png"
                 HeightRequest="300"

Qwirkle/Qwirkle/Resources/Styles/Styles.xaml

@@ -187,18 +187,26 @@
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
     </Style>
 
-    <Style TargetType="Label" x:Key="Headline">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
-        <Setter Property="FontSize" Value="32" />
+    <Style TargetType="Label" x:Key="Title">
+        <Setter Property="TextColor" Value="Black" />
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="Padding" Value="75" />
+        <Setter Property="HorizontalOptions" Value="Center" />
+        <Setter Property="FontAttributes" Value="Bold" />
+    </Style>
+
+    <Style TargetType="Label" x:Key="SubTitle">
+        <Setter Property="TextColor" Value="Black" />
+        <Setter Property="FontSize" Value="25" />
+        <Setter Property="Padding" Value="50" />
         <Setter Property="HorizontalOptions" Value="Center" />
-        <Setter Property="HorizontalTextAlignment" Value="Center" />
+        <Setter Property="FontAttributes" Value="Bold" />
     </Style>
 
-    <Style TargetType="Label" x:Key="SubHeadline">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
-        <Setter Property="FontSize" Value="24" />
+    <Style TargetType="Label" x:Key="Content">
+        <Setter Property="TextColor" Value="Black" />
+        <Setter Property="FontSize" Value="20" />
         <Setter Property="HorizontalOptions" Value="Center" />
-        <Setter Property="HorizontalTextAlignment" Value="Center" />
     </Style>
 
     <Style TargetType="ListView">