archive/FoxTube
Archived
1
0
Fork 0
Code Actions Activity

#200, 203: Fixed

Browse Source
This commit is contained in:
Michael Gordeev
2018-10-08 19:02:49 +03:00
parent 8d09fc9a89
commit f642bb5653
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FoxTube/Pages/MainPage.xaml
+12 -5
View File
@@ -23,11 +23,18 @@
<VisualState.Setters> <VisualState.Setters>
<Setter Target="header.FontSize" Value="28"/> <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.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
</VisualStateManager.VisualStateGroups> </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> <NavigationView.MenuItems>
<NavigationViewItem x:Uid="/Main/home" Icon="Home" Content="Home" Name="toHome"/> <NavigationViewItem x:Uid="/Main/home" Icon="Home" Content="Home" Name="toHome"/>
@@ -67,7 +74,7 @@
</NavigationView.AutoSuggestBox> </NavigationView.AutoSuggestBox>
<NavigationView.Header> <NavigationView.Header>
<Grid Margin="10,25,0,0"> <Grid Name="headerGrid" Margin="0,-10,0,0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
@@ -76,7 +83,7 @@
<StackPanel Orientation="Horizontal" Grid.Column="1"> <StackPanel Orientation="Horizontal" Grid.Column="1">
<Button Name="notificationMenu" Click="notificationMenu_Click" <Button Name="notificationMenu" Click="notificationMenu_Click"
FontFamily="Segoe MDL2 Assets" Content="&#xED0D;" 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> <Button.Flyout>
<Flyout Content="{x:Bind notificationsCenter}"/> <Flyout Content="{x:Bind notificationsCenter}"/>
</Button.Flyout> </Button.Flyout>
@@ -84,7 +91,7 @@
<Button Name="account" <Button Name="account"
FontFamily="Segoe MDL2 Assets" Content="&#xE8FA;" 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> <Button.Flyout>
<MenuFlyout> <MenuFlyout>
<MenuFlyoutItem x:Uid="/Main/signEx" Text="Sign in with existing account" Name="signIn" Click="signIn_Click"/> <MenuFlyoutItem x:Uid="/Main/signEx" Text="Sign in with existing account" Name="signIn" Click="signIn_Click"/>
@@ -93,7 +100,7 @@
</Button.Flyout> </Button.Flyout>
</Button> </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"/> <PersonPicture Width="30" ToolTipService.ToolTip="My account" x:Uid="myAccount"/>
<Button.Flyout> <Button.Flyout>
<MenuFlyout> <MenuFlyout>