Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/thchazot1/cshark

WpfApp1/Conservation.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WpfApp1
-{
-    enum Conservation
-    {
-        EX,
-        EW,
-        CR,
-        EN,
-        VU,
-        NT,
-        LC,
-        DD,
-        NE
-    }
-}

WpfApp1/UserControlEdit.xaml

@@ -8,7 +8,7 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <DockPanel>
             <DockPanel x:Name="Button" DockPanel.Dock="Top">
-                <TextBlock Text="EDIT A SHARK" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20" FontSize="30" FontWeight="Bold" FontFamily="Candara Light"  Foreground="PowderBlue"/>
+                <TextBlock Text="EDIT A SHARK" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20" FontSize="30" FontWeight="Bold" FontFamily="Candara Light"  Foreground="{StaticResource Couleur3}"/>
                 <Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25"></Button>
             </DockPanel>
             <DockPanel Background="{StaticResource Couleur1}">