-DSG 2 vuotta sitten
vanhempi
commit
114dfe6cb4

+ 2 - 2
RaspisKusach/MainWindow.xaml

@@ -27,8 +27,8 @@
                            Margin="5,0,0,0"
                            Height="{Binding Path=ActualHeight, ElementName=Bar}"/>
                     <Label Content="Поездочка"
-                       Foreground="Gray"
-                       FontWeight="SemiBold"/>
+                           Foreground="Gray"
+                           FontWeight="SemiBold"/>
                 </StackPanel>
                 
                 <StackPanel HorizontalAlignment="Right"

+ 39 - 0
RaspisKusach/Pages/MenuPage.xaml

@@ -0,0 +1,39 @@
+<Page x:Class="RaspisKusach.Pages.MenuPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:RaspisKusach.Pages"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" 
+      d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="50"/>
+        </Grid.RowDefinitions>
+        <Frame Name="MainContentFrame"
+               Grid.Row="0"
+               NavigationUIVisibility="Hidden" >
+        </Frame>
+        <StackPanel Grid.Row="1"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Center">
+            <Button Width="120"
+                    Height="40"
+                    Content="Купить билет"
+                    Margin="10,0,10,0">
+            </Button>
+            <Button Width="120"
+                    Height="40"
+                    Content="Расписание"
+                    Margin="10,0,10,0">
+            </Button>
+            <Button Width="120"
+                    Height="40"
+                    Content="Войти(Профиль)"
+                    Margin="10,0,10,0">
+            </Button>
+        </StackPanel>
+    </Grid>
+</Page>

+ 28 - 0
RaspisKusach/Pages/MenuPage.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace RaspisKusach.Pages
+{
+    /// <summary>
+    /// Логика взаимодействия для MenuPage.xaml
+    /// </summary>
+    public partial class MenuPage : Page
+    {
+        public MenuPage()
+        {
+            InitializeComponent();
+        }
+    }
+}

+ 7 - 0
RaspisKusach/RaspisKusach.csproj

@@ -94,6 +94,9 @@
     <Compile Include="Pages\MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\MenuPage.xaml.cs">
+      <DependentUpon>MenuPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\RegisterPage.xaml.cs">
       <DependentUpon>RegisterPage.xaml</DependentUpon>
     </Compile>
@@ -144,6 +147,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\MenuPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\RegisterPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

+ 2 - 2
RaspisKusach/Styles/Style.xaml

@@ -46,8 +46,8 @@
                 <ControlTemplate TargetType="Button">
                     <Border Name="Border" 
                             CornerRadius="10"
-                            Background="DimGray"
-                            BorderBrush="Black"
+                            Background="White"
+                            BorderBrush="LightGray"
                             BorderThickness="1"
                             MouseEnter="MouseEnter" 
                             MouseLeave="MouseLeave">