merge from master

pull/30/head
maxime.BATISTA@etu.uca.fr 2 years ago
commit 9b0e8d2659

@ -13,6 +13,7 @@
Title="Login Page" Title="Login Page"
ContentTemplate="{DataTemplate views:LoginPage}" ContentTemplate="{DataTemplate views:LoginPage}"
Route="Login" /> Route="Login" />
<ShellContent <ShellContent
Title="changePassword" Title="changePassword"
ContentTemplate="{DataTemplate views:changePassword}" ContentTemplate="{DataTemplate views:changePassword}"

@ -40,52 +40,83 @@
RowDefinitions="Auto, *, Auto, *,Auto,*"> RowDefinitions="Auto, *, Auto, *,Auto,*">
<Label <Label
Grid.Row="0" Grid.Row="0"
Text="Old Password" Text="Old Password Here :"
FontFamily="PoppinsBold" FontFamily="PoppinsBold"
TextColor="{StaticResource TextColorSecondary}"/> TextColor="{StaticResource TextColorSecondary}"/>
<Border <Border
Grid.Row="1" Style="{StaticResource SecondaryBorder}"
Style="{StaticResource SecondaryBorder}"> Margin="0,30,10,20">
<Entry <Grid
Style="{StaticResource UserInput}" Padding="5"
IsPassword="True" BackgroundColor="{StaticResource BackgroundSecondary}"
Placeholder="Type your old password here"/> ColumnDefinitions="Auto,Auto,*">
<Image
Grid.Column="1"
Source="password_icon.svg">
</Image>
<Entry
Style="{StaticResource UserInput}"
Grid.Column="2"
Placeholder="Old Password"/>
</Grid>
</Border> </Border>
<Label <Label
Grid.Row="2" Grid.Row="0"
Text="New password" Text="New Password Here :"
FontFamily="PoppinsBold" FontFamily="PoppinsBold"
TextColor="{StaticResource TextColorSecondary}"/> TextColor="{StaticResource TextColorSecondary}"/>
<Border <Border
Grid.Row="3" Style="{StaticResource SecondaryBorder}"
Style="{StaticResource SecondaryBorder}"> Margin="0,30,0,20">
<Entry <Grid
Style="{StaticResource UserInput}" Padding="5"
IsPassword="True" BackgroundColor="{StaticResource BackgroundSecondary}"
Placeholder="Type your new password here"/> ColumnDefinitions="Auto,Auto,*">
<Image
Grid.Column="1"
Source="password_icon.svg">
</Image>
<Entry
Style="{StaticResource UserInput}"
Grid.Column="2"
Placeholder="Old Password"/>
</Grid>
</Border> </Border>
<Label <Label
Grid.Row="4" Grid.Row="0"
Text="Confirm the new password" Text="Confirm New Password Here :"
FontFamily="PoppinsBold" FontFamily="PoppinsBold"
Margin="0,0,0,0" Margin="0,0,0,0"
TextColor="{StaticResource TextColorSecondary}"/> TextColor="{StaticResource TextColorSecondary}"/>
<Border <Border
Grid.Row="5" Style="{StaticResource SecondaryBorder}"
Style="{StaticResource SecondaryBorder}"> Margin="0,30,0,20">
<Entry <Grid
Style="{StaticResource UserInput}" Padding="5"
IsPassword="True" BackgroundColor="{StaticResource BackgroundSecondary}"
Placeholder="Type your new password here"/> ColumnDefinitions="Auto,Auto,*">
<Image
Grid.Column="1"
Source="password_icon.svg">
</Image>
<Entry
Style="{StaticResource UserInput}"
Grid.Column="2"
Placeholder="Old Password"/>
</Grid>
</Border> </Border>
</Grid> </Grid>

Loading…
Cancel
Save