Browse Source

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

AngelikaSuhareva 4 months ago
parent
commit
956e5cbd7c
2 changed files with 13 additions and 10 deletions
  1. 12 9
      Views/AddEmployeesView.axaml
  2. 1 1
      Views/AddOutletsView.axaml

+ 12 - 9
Views/AddEmployeesView.axaml

@@ -51,6 +51,15 @@
 		</StackPanel>
 		<StackPanel Orientation="Vertical">
 			<StackPanel.Styles>
+				<Style Selector="ListBox.filters ListBoxItem:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="#FFF8F8"/>
+				</Style>
+				<Style Selector="ListBox.filters ListBoxItem:focus-within /template/ ContentPresenter">
+					<Setter Property="Background" Value="Transparent"/>
+				</Style>
+				<Style Selector="ListBox.filters ListBoxItem:selected /template/ ContentPresenter">
+					<Setter Property="Background" Value="Transparent"/>
+				</Style>
 				<Style Selector="TextBlock.TextToTextBox">
 					<Setter Property="Foreground" Value="Black"></Setter>
 					<Setter Property="FontFamily" Value="Roboto"></Setter>
@@ -144,12 +153,7 @@
 				<TextBlock Classes="Chapter">Добавление данных о новом сотруднике</TextBlock>
 			</StackPanel>
 			<ScrollViewer Height="600">
-				<StackPanel Orientation="Vertical">
-					<StackPanel Orientation="Horizontal">
-						<TextBlock Classes="TextToTextBox">ID:</TextBlock>
-						<TextBox Watermark="ID" Width="360" Margin="218 20 0 0"></TextBox>
-					</StackPanel>
-					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
+				<StackPanel Orientation="Vertical">					
 					<StackPanel Orientation="Horizontal">
 						<TextBlock Classes="TextToTextBox">Фамилия:</TextBlock>
 						<TextBox Text="{Binding AddEmployeesVM.CurrentUser.Surname}" Watermark="Фамилия" Width="360" Margin="160 20 0 0"></TextBox>
@@ -196,11 +200,11 @@
 					</StackPanel>
 					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="197 30 0 10" HorizontalAlignment="Left"></Border>
 					<TextBlock Classes="TextToTextBox">Проекты:</TextBlock>
-					<ListBox ItemsSource="{Binding ListProjects}">
+					<ListBox ItemsSource="{Binding ListProjects}" Background="Transparent" IsTabStop="False" Classes="filters" Width="1150">
 						<ListBox.ItemTemplate>
 							<DataTemplate>
 								<StackPanel Orientation="Vertical">
-									<CheckBox Classes="TextToCheckBox" Margin="202 10 0 0">
+									<CheckBox Classes="TextToCheckBox" Margin="-5 0 0 -10">
 										<TextBlock Text="{Binding Title}"></TextBlock>
 									</CheckBox>
 								</StackPanel>
@@ -236,7 +240,6 @@
 				<Style Selector="Button.BtDelete:pressed">
 					<Setter Property="RenderTransform" Value="none"/>
 				</Style>
-
 				<Style Selector="TextBlock.TextBtSave">
 					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
 					<Setter Property="FontFamily" Value="Roboto"></Setter>

+ 1 - 1
Views/AddOutletsView.axaml

@@ -179,7 +179,7 @@
 				<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
 				<StackPanel Orientation="Vertical">
 					<TextBlock Classes="TextToTextBox">Проекты:</TextBlock>
-					<ListBox ItemsSource="{Binding ListProjects}" Background="Transparent" IsTabStop="False" Classes="filters" Width="1150" >
+					<ListBox ItemsSource="{Binding ListProjects}" Background="Transparent" IsTabStop="False" Classes="filters" Width="1150">
 						<ListBox.ItemTemplate>
 							<DataTemplate>
 								<StackPanel Orientation="Vertical">