Browse Source

Merge branch 'master' of http://gogs.ngknn.ru:3000/Acosta/Frontend

AngelikaSuhareva 4 months ago
parent
commit
a59a2628e6
2 changed files with 9 additions and 5 deletions
  1. 0 1
      ViewModels/MainWindowViewModel.cs
  2. 9 4
      Views/AuthorizationView.axaml

+ 0 - 1
ViewModels/MainWindowViewModel.cs

@@ -12,7 +12,6 @@ namespace Acosta.ViewModels
         public void LoadPersonalAccount()
         {
             UC = new PersonalAccountView();
-
         }
 
     }

+ 9 - 4
Views/AuthorizationView.axaml

@@ -21,13 +21,18 @@
 					<Setter Property="Background" Value="#A10009"></Setter>
 				</Style>
 			</StackPanel.Styles>
-			
+
 			<Image Source="avares://Acosta/Assets/AcostaLogo.png" Width="450" Margin="0 0 0 100"></Image>
 			<TextBox Watermark="Логин" Width="360" FontSize="13" Margin="0 0 0 10"></TextBox>
 			<TextBox Watermark="Пароль" PasswordChar="•" Width="360"></TextBox>
-			<TextBlock Margin="0 5 0 0" HorizontalAlignment="Center" FontFamily="Roboto" FontSize="13" Foreground="#A52C2C"></TextBlock>
-			<Button HorizontalAlignment="Center" Margin="0 20 0 10" Width="230" Height="45" CornerRadius="10" Background="#E40714" Command="{Binding LoadPersonalAccount}">
-				<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontFamily="Roboto" FontSize="16" FontWeight="DemiBold" Foreground="White">Войти</TextBlock>
+			<TextBlock Margin="0 5 0 0" HorizontalAlignment="Center" 
+					   FontFamily="Roboto" FontSize="13" Foreground="#A52C2C">
+			</TextBlock>
+			<Button HorizontalAlignment="Center" Margin="0 20 0 10" Width="230" 
+					Height="45" CornerRadius="10" Background="#E40714" Command="{Binding LoadPersonalAccount}">
+				<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" 
+						   FontFamily="Roboto" FontSize="16" FontWeight="DemiBold" Foreground="White">Войти
+				</TextBlock>
 			</Button>
 		</StackPanel>
 	</Grid>