Merge branch 'Navigator' of https://codefirst.iut.uca.fr/git/hugo.livet/ConsEco into Navigator

Code/IHM/App.xaml

@@ -17,15 +17,6 @@
             <Setter Property="Width" Value="175"/>
         </Style>
 
-        <Style x:Key="TitleBorder" TargetType="Border">
-            <Setter Property="BorderThickness" Value="2" />
-            <Setter Property="BorderBrush" Value="Black" />
-            <Setter Property="Margin" Value="20"/>
-            <Setter Property="CornerRadius" Value="5"/>
-            <Setter Property="Height" Value="30"/>
-            <Setter Property="Width" Value="175"/>
-        </Style>
-
         <Style TargetType="UserControl" x:Key="ImageFondRessource">
             <Setter Property="Background" Value="White">
                 <!--<Setter.Value>
@@ -49,11 +40,13 @@
 
         <Style x:Key="TitreDePage" TargetType="TextBlock">
             <Setter Property="HorizontalAlignment" Value="Center"/>
-            <Setter Property="VerticalAlignment" Value="Top"/>
-            <Setter Property="Background" Value="MediumPurple" />
             <Setter Property="FontFamily" Value="Slab serif"/>
-            <Setter Property="FontSize" Value="20"/>
+            <Setter Property="FontSize" Value="30"/>
             <Setter Property="FontWeight" Value="Bold"/>
+            <Setter Property="DockPanel.Dock" Value="Top"/>
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="Margin" Value="20"/>
+
         </Style>
 
         <Style TargetType="Button" x:Key="TransparentButtonRessource">

Code/IHM/UCBienvenue.xaml

@@ -8,8 +8,7 @@
              d:DesignHeight="450" d:DesignWidth="800"
              Style="{StaticResource ImageFondRessource}">
     <DockPanel>
-        <TextBlock Text="Bienvenue sur Cons'Eco" DockPanel.Dock="Top" Foreground="White" HorizontalAlignment="Center" FontSize="28" Margin="20"/>
+        <TextBlock Style="{StaticResource TitreDePage}" >Bienvenue sur Cons'Eco</TextBlock>
-
         <Image Source="./images/logo.png" DockPanel.Dock="Top" Height="100" />
 
         <TextBlock Foreground="Black" FontSize="15" HorizontalAlignment="Center" DockPanel.Dock="Top">

Code/IHM/UCCompte.xaml

@@ -9,9 +9,7 @@
              Style="{StaticResource ImageFondRessource}">
 
     <DockPanel>
-        <Border Style="{StaticResource TitleBorder}" DockPanel.Dock="Top">
+        <TextBlock Style="{StaticResource TitreDePage}" >Connexion</TextBlock>
-            <TextBlock Text="Nom d'utilisateur" Style="{StaticResource TitreDePage}"/>
-        </Border>
         <Button DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}" Height="25" Width="170" Margin="20">
             <TextBlock Text="Modifier votre solde" Style="{StaticResource TextBlockRessource}"/>
         </Button>

Code/IHM/UCConnexion.xaml

@@ -9,7 +9,7 @@
              Style="{StaticResource ImageFondRessource}">
 
     <DockPanel>
-        <TextBlock DockPanel.Dock="Top" Foreground="White" HorizontalAlignment="Center" FontSize="30" Margin="20">Connexion</TextBlock>
+        <TextBlock Style="{StaticResource TitreDePage}" >Connexion</TextBlock>
         <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center" FontSize="15" Margin="20">Connectez vous à un compte déjà existant</TextBlock>
 
         <Button Click="Button_Click_Acceuil" Margin="20" DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}">

Code/IHM/UCInscription.xaml

@@ -8,8 +8,8 @@
              d:DesignHeight="450" d:DesignWidth="800"
              Style="{StaticResource ImageFondRessource}">
     <DockPanel>
-        
+
-        <TextBlock DockPanel.Dock="Top" Foreground="White" HorizontalAlignment="Center" FontSize="30" Margin="20">Inscription</TextBlock>
+        <TextBlock Style="{StaticResource TitreDePage}" >Inscription</TextBlock>
         <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center" FontSize="15" Margin="20">Veuillez créer votre compte en retrant vos informations</TextBlock>
 
         <Button Click="Button_Click_Acceuil" Margin="20" DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}">