Imagara 2 anos atrás
pai
commit
ef469c4623
1 arquivos alterados com 32 adições e 20 exclusões
  1. 32 20
      RaspisKusach/Pages/SchedulePage.xaml

+ 32 - 20
RaspisKusach/Pages/SchedulePage.xaml

@@ -9,44 +9,56 @@
       d:DesignHeight="367" 
       d:DesignWidth="792"
       Title="Расписание">
-    
+
     <Page.Resources>
         <math:MathConverter x:Key="math"/>
     </Page.Resources>
     <Grid Background="White">
         <Grid.RowDefinitions>
-            <RowDefinition Height="40"/>
-            <RowDefinition Height="40"/>
-            <RowDefinition/>
+            <RowDefinition Height="80*"/>
+            <RowDefinition Height="287*"/>
         </Grid.RowDefinitions>
-        <Label Name="TimeNowLabel"
+        <Border 
+            Background="{StaticResource ItemColor}"
+            BorderBrush="{StaticResource Selection}"
+            BorderThickness="1.5"
+            CornerRadius="10"
+            Margin="5">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <Label Name="TimeNowLabel"
                FontSize="20"
                Content="Текущее время">
-        </Label>
-        <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.6*"/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
+                </Label>
+                <Grid Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="0.6*"/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-            <Label Grid.Column="0"
+                    <Label Grid.Column="0"
                    FontSize="14"
                    Content="№Рейса"/>
-            <Label Grid.Column="1"
+                    <Label Grid.Column="1"
                    FontSize="14"
                    Content="Направление"/>
-            <Label Grid.Column="2"
+                    <Label Grid.Column="2"
                    FontSize="14"
                    Content="Время прибытия"/>
-            <Label Grid.Column="3"
+                    <Label Grid.Column="3"
                    FontSize="14"
                    Content="Время отправления"/>
-        </Grid>
+                </Grid>
+            </Grid>
+        </Border>
 
         <ListBox Name="TripsListBox"
-                 Grid.Row="2"
+                 Grid.Row="1"
                  Background="White"
                  BorderBrush="{x:Null}"
                  ScrollViewer.HorizontalScrollBarVisibility="Disabled"
@@ -68,7 +80,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            
+
                             <Label Grid.Column="0"
                                    FontSize="14"
                                    Content="{Binding Trip.Routes.Name}"/>