Gestion des conflits et marge des fichier.
continuous-integration/drone/push Build is passing Details

Navigator
Vincent ASTOLFI 2 years ago
commit 96c2ba6510

@ -30,5 +30,7 @@
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
</Style> </Style>
<SolidColorBrush x:Key="CouleurPrincipale" Color="Black"/>
</Application.Resources> </Application.Resources>
</Application> </Application>

@ -7,4 +7,14 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<None Remove="images\logo.png" />
</ItemGroup>
<ItemGroup>
<Content Include="images\logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project> </Project>

@ -6,7 +6,23 @@
xmlns:local="clr-namespace:IHM" xmlns:local="clr-namespace:IHM"
mc:Ignorable="d" mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800"> Title="MainWindow" Height="450" Width="800">
<Grid> <Grid Background="{StaticResource CouleurPrincipale}">
<Grid.RowDefinitions>
<RowDefinition Height="0.25*"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.25*"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Image Source="images/logo.png" Margin="10" Grid.Column="0" Grid.Row="0"/>
<StackPanel Grid.Column="0" Grid.Row="1">
<Button Content="Tableau de bord"/>
</StackPanel>
</Grid> </Grid>
</Window> </Window>

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

Loading…
Cancel
Save