Some fixed and improvements.

1 files changed, 16 insertions, 16 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 3aa6e0118..7f1c1a115 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -26,8 +26,8 @@
     <Grid>
         <touch:TouchSideMenu x:Name="menu" IsOpened="{Binding IsMenuOpened,Mode=TwoWay}" Grid.Row="1">
             <touch:TouchSideMenu.MenuContent>
-                <Border x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDividerBrush}">
-                    <DockPanel LastChildFill="False" Background="{StaticResource TangoPrimaryBackgroundBrush}">
+                <Border x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDividerBrush}" TextElement.Foreground="{StaticResource TangoLightForegroundBrush}">
+                    <DockPanel LastChildFill="False" Background="#D9151515">
                         <StackPanel MinWidth="300" DockPanel.Dock="Top">
                             <Grid>
                                 <touch:TouchToggleButton Style="{StaticResource TangoTouchToggleButtonHamburger}" 
@@ -61,21 +61,21 @@
                                 </StackPanel>
                             </Grid>
                             <StackPanel Margin="0 16 0 0">
-                                <touch:TouchButton Style="{StaticResource TangoFlatButton}" Command="{Binding HomeCommand}">
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                        <fa:ImageAwesome VerticalAlignment="Center" Icon="Home" Width="32" Height="32"></fa:ImageAwesome>
-                                        <TextBlock FontSize="16" VerticalAlignment="Center" Margin="10 0 0 0">Home</TextBlock>
+                                <touch:TouchButton Style="{StaticResource TangoFlatButton}" Foreground="{StaticResource TangoLightForegroundBrush}" FontWeight="Normal" Command="{Binding HomeCommand}" FontSize="{StaticResource TangoHeaderFontSize}">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <!--<fa:ImageAwesome VerticalAlignment="Center" Icon="Home" Width="48" Height="48"></fa:ImageAwesome>-->
+                                        <TextBlock VerticalAlignment="Center" Margin="0 0 0 0">Home</TextBlock>
                                     </StackPanel>
                                 </touch:TouchButton>
                             </StackPanel>
 
-                            <ItemsControl ItemsSource="{Binding ModuleLoader.UserModules}" Margin="0 20 0 0">
+                            <ItemsControl ItemsSource="{Binding ModuleLoader.UserModules}">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
-                                        <touch:TouchButton Style="{StaticResource TangoFlatButton}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}">
-                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                <Image VerticalAlignment="Center" Source="{Binding Image}" Width="32" Height="32"></Image>
-                                                <TextBlock FontSize="16" VerticalAlignment="Center" Margin="10 0 0 0" Text="{Binding Name}"></TextBlock>
+                                        <touch:TouchButton Margin="0 30 0 0" FontWeight="Normal" Foreground="{StaticResource TangoLightForegroundBrush}" Style="{StaticResource TangoFlatButton}" FontSize="{StaticResource TangoHeaderFontSize}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}">
+                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                <!--<Image VerticalAlignment="Center" Source="{Binding Image}" Width="48" Height="48"></Image>-->
+                                                <TextBlock VerticalAlignment="Center" Margin="0 0 0 0" Text="{Binding Name}"></TextBlock>
                                             </StackPanel>
                                         </touch:TouchButton>
                                     </DataTemplate>
@@ -84,11 +84,11 @@
                         </StackPanel>
 
                         <StackPanel DockPanel.Dock="Bottom">
-                            <Separator Margin="0 10 0 0" Background="Gainsboro" />
-                            <touch:TouchButton Style="{StaticResource TangoFlatButton}" Command="{Binding SignOutCommand}">
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                    <fa:ImageAwesome VerticalAlignment="Center" Icon="SignOut" Width="32" Height="32"></fa:ImageAwesome>
-                                    <TextBlock FontSize="16" VerticalAlignment="Center" Margin="10 0 0 0">Sign Out</TextBlock>
+                            <Separator Margin="0 10 0 0" Background="#505050" />
+                            <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="30" Command="{Binding SignOutCommand}" FontSize="{StaticResource TangoHeaderFontSize}" Foreground="{StaticResource TangoLightForegroundBrush}">
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                    <touch:TouchIcon VerticalAlignment="Center" Angle="180" Icon="Logout" Width="32" Height="32"></touch:TouchIcon>
+                                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Sign Out</TextBlock>
                                 </StackPanel>
                             </touch:TouchButton>
                         </StackPanel>