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

3 years ago · 898c103260
parent da270221a3 360231b28c
commit 898c103260
1 changed files with 1 additions and 0 deletions
--- a/WpfApp1/MainWindow.xaml
+++ b/WpfApp1/MainWindow.xaml
@ -16,6 +16,7 @@
                <ComboBoxItem Tag="Océans" >Indien</ComboBoxItem>
                <ComboBoxItem Tag="Océans" >Pacifique</ComboBoxItem>
            </ComboBox>
+            <TextBox DockPanel.Dock="Top" Text="Rechercher" FontFamily="{StaticResource Police1}" Foreground="{StaticResource Couleur1}" Height="25" Margin="5"/>
            <ListBox Background="{StaticResource Couleur3}">
                <ContentControl x:Name="contentControl">
                    <local:UserControlRequin/>