From f642bb5653b599a9ee27560ad5ebde14d28fd09e Mon Sep 17 00:00:00 2001
From: Michael Gordeev <mikhailagord@gmail.com>
Date: Mon, 8 Oct 2018 19:02:49 +0300
Subject: [PATCH] #200, 203: Fixed

---
 FoxTube/Pages/MainPage.xaml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/FoxTube/Pages/MainPage.xaml b/FoxTube/Pages/MainPage.xaml
index 8a69bb3..a2bfef9 100644
--- a/FoxTube/Pages/MainPage.xaml
+++ b/FoxTube/Pages/MainPage.xaml
@@ -23,11 +23,18 @@
 
                     <VisualState.Setters>
                         <Setter Target="header.FontSize" Value="28"/>
+                        <Setter Target="headerGrid.Margin" Value="10,25,0,0"/>
+                        <Setter Target="nav.Margin" Value="0"/>
+                        <Setter Target="account.Height" Value="50"/>
+                        <Setter Target="notificationMenu.Height" Value="50"/>
+                        <Setter Target="avatar.Height" Value="50"/>
+                        <Setter Target="AppTitle.Visibility" Value="Collapsed"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
-        <NavigationView SelectedItem="toHome" Windows10version1803:BackRequested="nav_BackRequested" Windows10version1803:PaneTitle="FoxTube" OpenPaneLength="300" Name="nav" SelectionChanged="nav_SelectionChanged">
+        <TextBlock x:Name="AppTitle" Style="{StaticResource CaptionTextBlockStyle}" Text="FoxTube" Margin="12,8"/>
+        <NavigationView Margin="0,30,0,0" SelectedItem="toHome" Windows10version1803:BackRequested="nav_BackRequested" Windows10version1803:PaneTitle="FoxTube" OpenPaneLength="300" Name="nav" SelectionChanged="nav_SelectionChanged">
 
             <NavigationView.MenuItems>
                 <NavigationViewItem x:Uid="/Main/home" Icon="Home" Content="Home" Name="toHome"/>
@@ -67,7 +74,7 @@
             </NavigationView.AutoSuggestBox>
 
             <NavigationView.Header>
-                <Grid Margin="10,25,0,0">
+                <Grid Name="headerGrid" Margin="0,-10,0,0">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition/>
                         <ColumnDefinition Width="Auto"/>
@@ -76,7 +83,7 @@
                     <StackPanel Orientation="Horizontal" Grid.Column="1">
                         <Button Name="notificationMenu" Click="notificationMenu_Click"
                             FontFamily="Segoe MDL2 Assets" Content="&#xED0D;"
-                            Width="50" Height="50" Background="Transparent" x:Uid="notifications" ToolTipService.ToolTip="Notifications">
+                            Width="50" Height="42" Background="Transparent" x:Uid="notifications" ToolTipService.ToolTip="Notifications">
                             <Button.Flyout>
                                 <Flyout Content="{x:Bind notificationsCenter}"/>
                             </Button.Flyout>
@@ -84,7 +91,7 @@
 
                         <Button Name="account"
                         FontFamily="Segoe MDL2 Assets" Content="&#xE8FA;"
-                        Width="50" Height="50" Background="Transparent" x:Uid="signIn" ToolTipService.ToolTip="Sign in">
+                        Width="50" Height="42" Background="Transparent" x:Uid="signIn" ToolTipService.ToolTip="Sign in">
                             <Button.Flyout>
                                 <MenuFlyout>
                                     <MenuFlyoutItem x:Uid="/Main/signEx" Text="Sign in with existing account" Name="signIn" Click="signIn_Click"/>
@@ -93,7 +100,7 @@
                             </Button.Flyout>
                         </Button>
 
-                        <Button Width="50" Background="Transparent" Height="50" Visibility="Collapsed" Name="avatar">
+                        <Button Width="50" Background="Transparent" Height="42" Visibility="Collapsed" Name="avatar">
                             <PersonPicture Width="30" ToolTipService.ToolTip="My account" x:Uid="myAccount"/>
                             <Button.Flyout>
                                 <MenuFlyout>