Katya 2 kuukautta sitten
vanhempi
commit
8b3b91f7d3
2 muutettua tiedostoa jossa 29 lisäystä ja 58 poistoa
  1. 14 29
      Views/ProjectsView.axaml
  2. 15 29
      Views/VisitsView.axaml

+ 14 - 29
Views/ProjectsView.axaml

@@ -232,6 +232,19 @@
 								<Setter Property="CornerRadius" Value="13"></Setter>
 								<Setter Property="Width" Value="150"></Setter>
 							</Style>
+							<Style Selector="Button.BtEdit">
+								<Setter Property="BorderThickness" Value="2"></Setter>
+								<Setter Property="Background" Value="#FFF8F8"></Setter>
+								<Setter Property="CornerRadius" Value="13"></Setter>
+								<Setter Property="BorderBrush" Value="#E40714"></Setter>
+							</Style>
+							<Style Selector="Button.BtEdit:pointerover /template/ ContentPresenter">
+								<Setter Property="Background" Value="#FFF8F8"></Setter>
+								<Setter Property="BorderBrush" Value="#E40714"></Setter>
+							</Style>
+							<Style Selector="Button.BtEdit:pressed">
+								<Setter Property="RenderTransform" Value="none"/>
+							</Style>
 						</StackPanel.Styles>
 						<ListBox ItemsSource="{Binding ListProjects}" Classes="filters" Background="Transparent" IsTabStop="False">
 							<ListBox.ItemTemplate>
@@ -249,7 +262,7 @@
 										<Border Classes="TextColumn" Width="200" Margin="200 0 0 20">
 											<TextBlock Text="{Binding Numofvisitsperweek}" Classes="TextColumn">Количество посещений в неделю</TextBlock>
 										</Border>
-										<Button Margin="30 5" FontFamily="Roboto" VerticalAlignment="Top">
+										<Button Classes="BtEdit" Margin="30 5" FontFamily="Roboto" VerticalAlignment="Top">
 											<Image Source="avares://Acosta/Assets/change.png" Width="20"></Image>
 										</Button>
 									</StackPanel>
@@ -260,33 +273,5 @@
 				</ScrollViewer>
 			</StackPanel>
 		</StackPanel>
-		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-			<StackPanel.Styles>
-				<Style Selector="TextBlock.TextBtSave">
-					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
-					<Setter Property="FontFamily" Value="Roboto"></Setter>
-					<Setter Property="FontWeight" Value="Medium"></Setter>
-					<Setter Property="FontSize" Value="20"></Setter>
-					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
-					<Setter Property="VerticalAlignment" Value="Center"></Setter>
-				</Style>
-				<Style Selector="Button.BtSave">
-					<Setter Property="Width" Value="180"></Setter>
-					<Setter Property="Height" Value="38"></Setter>
-					<Setter Property="Margin" Value="0 740 30 20"></Setter>
-					<Setter Property="Background" Value="#E40714"></Setter>
-					<Setter Property="CornerRadius" Value="13"></Setter>
-				</Style>
-				<Style Selector="Button.BtSave:pointerover /template/ ContentPresenter">
-					<Setter Property="Background" Value="#A10009"></Setter>
-				</Style>
-				<Style Selector="Button.BtSave:pressed">
-					<Setter Property="RenderTransform" Value="none"/>
-				</Style>
-			</StackPanel.Styles>
-			<Button Classes="BtSave" Command="">
-				<TextBlock Classes="TextBtSave">Сохранить</TextBlock>
-			</Button>
-		</StackPanel>
 	</Grid>
 </UserControl>

+ 15 - 29
Views/VisitsView.axaml

@@ -207,6 +207,19 @@
 								<Setter Property="CornerRadius" Value="13"></Setter>
 								<Setter Property="Width" Value="150"></Setter>
 							</Style>
+							<Style Selector="Button.BtEdit">
+								<Setter Property="BorderThickness" Value="2"></Setter>
+								<Setter Property="Background" Value="#FFF8F8"></Setter>
+								<Setter Property="CornerRadius" Value="13"></Setter>
+								<Setter Property="BorderBrush" Value="#E40714"></Setter>
+							</Style>
+							<Style Selector="Button.BtEdit:pointerover /template/ ContentPresenter">
+								<Setter Property="Background" Value="#FFF8F8"></Setter>
+								<Setter Property="BorderBrush" Value="#E40714"></Setter>
+							</Style>
+							<Style Selector="Button.BtEdit:pressed">
+								<Setter Property="RenderTransform" Value="none"/>
+							</Style>
 						</StackPanel.Styles>
 						<ListBox ItemsSource="{Binding ListVisits}" Classes="filters" Background="Transparent" IsTabStop="False">
 							<ListBox.ItemTemplate>
@@ -227,7 +240,7 @@
 										<Border Classes="TextColumn">
 											<TextBlock Text="{Binding AcceptedNavigation.Title}" Classes="TextColumn">Принят</TextBlock>
 										</Border>
-										<Button Margin="30 5" FontFamily="Roboto" VerticalAlignment="Top">
+										<Button Classes="BtEdit" Margin="30 5" FontFamily="Roboto" VerticalAlignment="Top">
 											<Image Source="avares://Acosta/Assets/change.png" Width="20"></Image>
 										</Button>
 									</StackPanel>
@@ -238,33 +251,6 @@
 				</ScrollViewer>
 			</StackPanel>
 		</StackPanel>
-		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-			<StackPanel.Styles>
-				<Style Selector="TextBlock.TextBtSave">
-					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
-					<Setter Property="FontFamily" Value="Roboto"></Setter>
-					<Setter Property="FontWeight" Value="Medium"></Setter>
-					<Setter Property="FontSize" Value="20"></Setter>
-					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
-					<Setter Property="VerticalAlignment" Value="Center"></Setter>
-				</Style>
-				<Style Selector="Button.BtSave">
-					<Setter Property="Width" Value="180"></Setter>
-					<Setter Property="Height" Value="38"></Setter>
-					<Setter Property="Margin" Value="0 740 30 20"></Setter>
-					<Setter Property="Background" Value="#E40714"></Setter>
-					<Setter Property="CornerRadius" Value="13"></Setter>
-				</Style>
-				<Style Selector="Button.BtSave:pointerover /template/ ContentPresenter">
-					<Setter Property="Background" Value="#A10009"></Setter>
-				</Style>
-				<Style Selector="Button.BtSave:pressed">
-					<Setter Property="RenderTransform" Value="none"/>
-				</Style>
-			</StackPanel.Styles>
-			<Button Classes="BtSave" Command="">
-				<TextBlock Classes="TextBtSave">Сохранить</TextBlock>
-			</Button>
-		</StackPanel>
+		
 	</Grid>
 </UserControl>