Nextrek
Diff Revisions
659
vs
660
for /Android/SmartCharging/SmartCharging_WP/SmartCharging/obj/Debug/LoginPage.xaml
|
@@ -11,11 +11,6 @@ |
11 |
11 |
|
|
12 |
12 |
|
<Grid x:Name="LayoutRoot" Background="#2cdaff"> |
13 |
13 |
|
|
14 |
|
- |
<Grid.ChildrenTransitions> |
15 |
|
- |
<TransitionCollection> |
16 |
|
- |
<EntranceThemeTransition/> |
17 |
|
- |
</TransitionCollection> |
18 |
|
- |
</Grid.ChildrenTransitions> |
19 |
14 |
|
|
20 |
15 |
|
<Grid.RowDefinitions> |
21 |
16 |
|
<RowDefinition Height="*"/> |
|
@@ -23,7 +18,7 @@ |
23 |
18 |
|
<RowDefinition Height="*"/> |
24 |
19 |
|
</Grid.RowDefinitions> |
25 |
20 |
|
|
26 |
|
- |
|
|
21 |
+ |
|
27 |
22 |
|
<Image Grid.Row="0" Source="Assets/splash-half.png" NineGrid="0" IsHoldingEnabled="False" IsHitTestVisible="False" IsDoubleTapEnabled="False" IsRightTapEnabled="False" IsTapEnabled="False" RenderTransformOrigin="0.5,0.5" > |
28 |
23 |
|
</Image> |
29 |
24 |
|
|
|
@@ -66,17 +61,15 @@ |
66 |
61 |
|
<StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Stretch" HorizontalAlignment="Center" Margin="0,10,0,0"> |
67 |
62 |
|
|
68 |
63 |
|
<TextBlock Text="" x:Uid="NoAccountTextBlock" Foreground="#666666" FontWeight="SemiBold" FontSize="13" VerticalAlignment="Center" Padding="0,0,5,0" ></TextBlock> |
69 |
|
- |
<TextBlock x:ConnectionId='3' x:Name="RegisterLink" Foreground="#666666" FontWeight="Bold" FontSize="15" VerticalAlignment="Center" Margin="3,0,0,0"> |
|
64 |
+ |
<TextBlock x:ConnectionId='2' x:Name="RegisterLink" Foreground="#666666" FontWeight="Bold" FontSize="15" VerticalAlignment="Center" Margin="3,0,0,0"> |
70 |
65 |
|
<Underline> Registrati</Underline> |
71 |
66 |
|
</TextBlock> |
72 |
67 |
|
|
73 |
68 |
|
</StackPanel> |
74 |
|
- |
<TextBlock x:ConnectionId='2' x:Name="RegisterSiteLink" x:Uid="NoAccountTextBlock" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Foreground="#666666" FontWeight="Bold" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" > |
75 |
|
- |
<Underline>Vuoi registrare un locale?</Underline> |
76 |
|
- |
</TextBlock> |
77 |
69 |
|
|
78 |
70 |
|
</Grid> |
79 |
71 |
|
|
|
72 |
+ |
<ProgressRing x:Name="Loader" IsActive="True" Grid.RowSpan="100" Grid.ColumnSpan="100" Background="#99000000" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" IsHitTestVisible="True" Visibility="Collapsed" Foreground="#FF2CDAFF"/> |
80 |
73 |
|
|
81 |
74 |
|
</Grid> |
82 |
75 |
|
</Page> |