From 73621db4f1862815d2eb945a58806c23f3c3eec4 Mon Sep 17 00:00:00 2001
From: majean5 <Mathilde.JEAN3@etu.uca.fr>
Date: Fri, 15 Apr 2022 12:32:57 +0200
Subject: [PATCH] =?UTF-8?q?Ressources=20et=20style=20am=C3=A9lior=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ressources/Class1.cs           | 8 --------
 Ressources/Dictionnaire.xaml   | 8 ++++++--
 WpfApp1/AddAShark.xaml         | 6 +++---
 WpfApp1/MainWindow.xaml        | 5 ++---
 WpfApp1/UserControlRequin.xaml | 4 ++--
 5 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 Ressources/Class1.cs

diff --git a/Ressources/Class1.cs b/Ressources/Class1.cs
deleted file mode 100644
index 8995908..0000000
--- a/Ressources/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace Ressources
-{
-    public class Class1
-    {
-    }
-}
diff --git a/Ressources/Dictionnaire.xaml b/Ressources/Dictionnaire.xaml
index f45a6df..2b6e34f 100644
--- a/Ressources/Dictionnaire.xaml
+++ b/Ressources/Dictionnaire.xaml
@@ -2,6 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <FontFamily x:Key="Police1">Candara Light</FontFamily>
+    <FontFamily x:Key="Police2">Candara</FontFamily>
     <Brush x:Key="Couleur1">CadetBlue</Brush>
     <Brush x:Key="Couleur2">PowderBlue</Brush>
     <Brush x:Key="Couleur3">AliceBlue</Brush>
@@ -11,12 +12,15 @@
         <Setter Property="FontFamily" Value="{StaticResource Police1}"/>
         <Setter Property="Foreground" Value="{StaticResource Couleur1}"/>
     </Style>
-    <Style TargetType="Button">
+    <Style TargetType="Button" x:Key="Button1">
         <Setter Property="BorderBrush" Value="{StaticResource Couleur3}"/>
         <Setter Property="BorderThickness" Value="2"/>
         <Setter Property="Background" Value="{StaticResource Couleur2}"/>
         <Setter Property="Foreground" Value="{StaticResource Couleur3}"/>
-        <Setter Property=""
+        <Setter Property="FontFamily" Value="{StaticResource Police1}"/>
+    </Style>
+    <Style TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="{StaticResource Police1}"/>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/WpfApp1/AddAShark.xaml b/WpfApp1/AddAShark.xaml
index 1e7a803..e758b38 100644
--- a/WpfApp1/AddAShark.xaml
+++ b/WpfApp1/AddAShark.xaml
@@ -9,10 +9,10 @@
     <DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
             <TextBlock Text="ADD A SHARK" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20" FontSize="30" FontWeight="Bold" FontFamily="Candara Light"  Foreground="PowderBlue"/>
-            <Button x:Name="add" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" BorderBrush="AliceBlue" BorderThickness="2" Background="PowderBlue" Width="50" Height="50" FontFamily="Candara Light" FontSize="25" Foreground="AliceBlue"></Button>
+            <Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25"></Button>
         </DockPanel>
-        <DockPanel Background="CadetBlue">
-            <TextBlock DockPanel.Dock="Top" Text="Shark information :" Margin="15" FontSize="18" Foreground="AliceBlue" FontFamily="Candara Light"/>
+        <DockPanel Background="{StaticResource Couleur1}">
+            <TextBlock DockPanel.Dock="Top" Text="Shark information :" Margin="15" FontSize="18" Foreground="{StaticResource Couleur3}" FontFamily="{StaticResource Police1}"/>
             <Grid Width="800">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml
index e0a0a72..a452b78 100644
--- a/WpfApp1/MainWindow.xaml
+++ b/WpfApp1/MainWindow.xaml
@@ -6,10 +6,9 @@
         xmlns:local="clr-namespace:WpfApp1"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
-
+    
     <DockPanel>
         <DockPanel DockPanel.Dock="Left" >
-
             <ComboBox DockPanel.Dock="Top" >
                 <ComboBoxItem Tag="Océans" IsSelected="True" >Tous</ComboBoxItem>
                 <ComboBoxItem Tag="Océans" >Arctique</ComboBoxItem>
@@ -32,7 +31,7 @@
         </DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
             <Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="196,10,10,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
-            <Button x:Name="add" HorizontalAlignment="Right" VerticalAlignment="Center" Content="+" Width="50" Height="50" FontSize="25"></Button>
+            <Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="+" Width="50" Height="50" FontSize="25"></Button>
         </DockPanel>
         <Image Source="Images\cartemaismieuxman.png"/>
     </DockPanel>
diff --git a/WpfApp1/UserControlRequin.xaml b/WpfApp1/UserControlRequin.xaml
index 64840df..d6da979 100644
--- a/WpfApp1/UserControlRequin.xaml
+++ b/WpfApp1/UserControlRequin.xaml
@@ -7,7 +7,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <ListBoxItem>
-        <Border BorderThickness="2" BorderBrush="PowderBlue" CornerRadius="4" Padding="4">
+        <Border BorderThickness="2" BorderBrush="{StaticResource Couleur2}" CornerRadius="4" Padding="4">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
@@ -19,7 +19,7 @@
                     <RowDefinition/>
                 </Grid.RowDefinitions>
                 <Image Source="Images\Heterodontus_francisci_catalina-1280-By-Ed-Bierman-from-CA-usa-Horn-Shark-CC-BY-2.0.jpg" Width="50" Height="30" Grid.RowSpan="3" Margin="4"/>
-                <TextBlock Grid.Column="1" Grid.Row="1" Text="Requin Dormeur Mexicain" FontWeight="DemiBold"/>
+                <TextBlock Grid.Column="1" Grid.Row="1" Text="Requin Dormeur Mexicain" FontFamily="{StaticResource Police2}"/>
                 <TextBlock Grid.Column="1" Grid.Row="2" Text="Heterodontus mexicanus" FontWeight="Thin"/>
             </Grid>
         </Border>