From c3cacd847c2b2577ef5d815963d1d8f2b557c8ac Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 19 Aug 2019 19:02:58 +0300
Subject: PPC Graphic changes

---
 .../PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs    | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
index 5062df1d6..fd967e39a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
@@ -143,6 +143,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Error",
                 Brush = Application.Current.Resources["TangoMessageBoxErrorBrush"] as Brush,
+                MessageType = MessageBoxVM.MessageTypes.Error,
             });
         }
 
@@ -159,6 +160,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Information",
                 Brush = Application.Current.Resources["TangoMessageBoxInfoBrush"] as Brush,
+                MessageType = MessageBoxVM.MessageTypes.Info,
             });
         }
 
@@ -175,6 +177,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Warning",
                 Brush = Application.Current.Resources["TangoMessageBoxWarningBrush"] as Brush,
+                MessageType = MessageBoxVM.MessageTypes.Warning,
             });
         }
 
@@ -192,6 +195,7 @@ namespace Tango.PPC.UI.Notifications
                 Title = "Confirm",
                 HasCancel = true,
                 Brush = Application.Current.Resources["TangoMessageBoxQuestionBrush"] as Brush,
+                MessageType = MessageBoxVM.MessageTypes.Question,
             });
         }
 
@@ -208,6 +212,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.Check,
                 Title = "Success",
                 Brush = Application.Current.Resources["TangoMessageBoxSuccessBrush"] as Brush,
+                MessageType = MessageBoxVM.MessageTypes.Success,
             });
         }
 
-- 
cgit v1.3.1


From 53d2c81ebf6a98b4a0c46559abd6a636a4517314 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Tue, 20 Aug 2019 14:49:46 +0300
Subject: PPC Graphic UX QA_1.1.19

---
 .../Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml  |  2 +-
 .../Tango.PPC.Jobs/Controls/RunningJobViewer.xaml  |  2 +-
 .../Tango.PPC.Jobs/Views/JobProgressView.xaml      |  6 +--
 .../Tango.PPC.Jobs/Views/JobSummeryView.xaml       |  6 +--
 .../PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml  |  2 +-
 .../Notifications/DefaultNotificationProvider.cs   | 11 +++--
 .../PPC/Tango.PPC.UI/Resources/Colors.xaml         |  5 +++
 .../PPC/Tango.PPC.UI/Views/LayoutView.xaml         |  2 +-
 .../Tango.ColorConversion/DefaultColorConverter.cs |  2 +-
 .../Tango.Integration/Operation/MachineStatuses.cs |  2 +-
 .../Tango.Touch/Controls/MessageBoxVM.cs           | 10 +----
 .../Tango.Touch/Controls/TouchPanel.xaml           | 49 +---------------------
 .../Visual_Studio/Tango.Touch/Resources/Fonts.xaml |  4 +-
 13 files changed, 26 insertions(+), 77 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
index 830718cb6..ba6c13e91 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
@@ -89,7 +89,7 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
 
-                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="0.8" StrokeDashArray="5 5 5 5" RadiusX="6" RadiusY="6" />
+                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="8" RadiusY="8" />
                 </Grid>
             </Border>
         </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml
index a0bc6c1d9..97aedcf89 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml
@@ -90,7 +90,7 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
 
-                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="10" RadiusY="10" />
+                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="8" RadiusY="8" />
                 </Grid>
             </Border>
         </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
index cf49bd024..4545d5903 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
@@ -89,7 +89,7 @@
                             <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Completed</TextBlock>
                         </StackPanel>
 
-                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                        <TextBlock FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                                             <Run Text="{Binding RunningJobStatus.ProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"></Run><Run Text="/" /><Run Text="{Binding RunningJobStatus.TotalProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"/>
                                             <Run FontSize="16">m</Run>
                         </TextBlock>
@@ -109,7 +109,7 @@
                         <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Time Left</TextBlock>
                     </StackPanel>
 
-                    <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                    <TextBlock FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                         <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run>
                         <Run FontSize="16" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
                     </TextBlock>
@@ -201,7 +201,7 @@
                     </Canvas>
 
                     <Grid>
-                        <controls:RunningJobViewer Height="30" Width="600" DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" />
+                        <controls:RunningJobViewer Height="26" Width="600" DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" />
 
                         <TextBlock Margin="0 0 -50 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
                             <Run Text="x"></Run><Run Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
index ad60c46ca..630b2089f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
@@ -68,7 +68,7 @@
                                             <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Length</TextBlock>
                                         </StackPanel>
 
-                                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                        <TextBlock FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                                             <Run Text="{Binding Job.LengthIncludingNumberOfUnits,Mode=OneWay,StringFormat=0,FallbackValue=0}"/>
                                             <Run FontSize="16">m</Run>
                                         </TextBlock>
@@ -82,7 +82,7 @@
                                             <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Time</TextBlock>
                                         </StackPanel>
 
-                                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                        <TextBlock FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                                         <Run Text="{Binding EstimatedDuration,Mode=OneWay,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run>
                                         <Run FontSize="16" Text="{Binding EstimatedDuration,Mode=OneWay,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
                                         </TextBlock>
@@ -91,7 +91,7 @@
                             </UniformGrid>
                         </Grid>
 
-                        <controls:JobSummeryViewer Height="34" DataContext="{Binding Job}" VerticalAlignment="Center" Margin="20 0" Grid.Row="2" />
+                        <controls:JobSummeryViewer Height="40" DataContext="{Binding Job}" VerticalAlignment="Center" Margin="20 0" Grid.Row="2" />
                     </Grid>
                 </DockPanel>
             </Border>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index 1c7e48bfa..2fd8496f8 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -648,7 +648,7 @@
 
                                                 <StackPanel Style="{StaticResource Level2ContainerExtraMargin}">
                                                     <Grid>
-                                                        <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" Height="34"/>
+                                                        <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" Height="40"/>
                                                     </Grid>
 
                                                     <DockPanel Margin="0 30 0 0" LastChildFill="False">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
index fd967e39a..b543fe58e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
@@ -143,10 +143,9 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Error",
                 Brush = Application.Current.Resources["TangoMessageBoxErrorBrush"] as Brush,
-                MessageType = MessageBoxVM.MessageTypes.Error,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderErrorBrush"] as Brush,
             });
         }
-
         /// <summary>
         /// Shows an information message box.
         /// </summary>
@@ -160,7 +159,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Information",
                 Brush = Application.Current.Resources["TangoMessageBoxInfoBrush"] as Brush,
-                MessageType = MessageBoxVM.MessageTypes.Info,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderInfoBrush"] as Brush,
             });
         }
 
@@ -177,7 +176,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Warning",
                 Brush = Application.Current.Resources["TangoMessageBoxWarningBrush"] as Brush,
-                MessageType = MessageBoxVM.MessageTypes.Warning,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderWarningBrush"] as Brush,
             });
         }
 
@@ -195,7 +194,7 @@ namespace Tango.PPC.UI.Notifications
                 Title = "Confirm",
                 HasCancel = true,
                 Brush = Application.Current.Resources["TangoMessageBoxQuestionBrush"] as Brush,
-                MessageType = MessageBoxVM.MessageTypes.Question,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderQuestionBrush"] as Brush,
             });
         }
 
@@ -212,7 +211,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.Check,
                 Title = "Success",
                 Brush = Application.Current.Resources["TangoMessageBoxSuccessBrush"] as Brush,
-                MessageType = MessageBoxVM.MessageTypes.Success,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderSuccessBrush"] as Brush,
             });
         }
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml
index 2b89aac82..f0e872285 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml
@@ -7,5 +7,10 @@
     <SolidColorBrush x:Key="TangoMessageBoxErrorBrush" Color="#FF6262" />
     <SolidColorBrush x:Key="TangoMessageBoxSuccessBrush" Color="#56da6c" />
     <SolidColorBrush x:Key="TangoMessageBoxQuestionBrush" Color="{StaticResource TangoPrimaryAccentColor}" />
+    <SolidColorBrush x:Key="TangoMessageBoxHeaderInfoBrush" Color="#DCE7FC" />
+    <SolidColorBrush x:Key="TangoMessageBoxHeaderWarningBrush" Color="#FFF4E9" />
+    <SolidColorBrush x:Key="TangoMessageBoxHeaderErrorBrush" Color="#F9E9EE" />
+    <SolidColorBrush x:Key="TangoMessageBoxHeaderSuccessBrush" Color="#F1FFF4" />
+    <SolidColorBrush x:Key="TangoMessageBoxHeaderQuestionBrush" Color="#DCE7FC" />
 
 </ResourceDictionary>
\ No newline at end of file
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 3d475d912..a0e7223c7 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -25,7 +25,7 @@
     <Grid>
         <touch:TouchSideMenu x:Name="menu" IsOpened="{Binding IsMenuOpened,Mode=TwoWay}" Grid.Row="1" >
             <touch:TouchSideMenu.MenuContent>
-                <Border TextElement.FontSize="{StaticResource TangoMenuItemFontSize}" TextElement.FontFamily="{StaticResource TangoFlexoMediumFontFamily}" Width="450" x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDarkForegroundBrush}" TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}">
+                <Border TextElement.FontSize="{StaticResource TangoMenuItemFontSize}" Width="450" x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDarkForegroundBrush}" TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}">
                     <DockPanel LastChildFill="False" Background="{StaticResource TangoPrimaryBackgroundBrush}">
                         <StackPanel MinWidth="300" DockPanel.Dock="Top">
                             <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1" Height="320">
diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
index f6fe9c74e..00df9f0de 100644
--- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
+++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
@@ -68,7 +68,7 @@ namespace Tango.ColorConversion
                 throw new ArgumentNullException("Specified RML is a null reference.");
             }
 
-            if (rml.Cct == null)
+            if (rml.Cct == null || rml.Cct.Data == null)
             {
                 throw new InvalidOperationException($"No CCT found for RML {rml.Name}. Could not create a conversion input.");
             }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs
index 8884b33a3..059c1f859 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs
@@ -13,7 +13,7 @@ namespace Tango.Integration.Operation
         Disconnected,
         [Description("Standby")]
         Standby,
-        [Description("Dye Job")]
+        [Description("Ready To Dye")]
         ReadyToDye,
         [Description("Getting Ready")]
         GettingReady,
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/MessageBoxVM.cs b/Software/Visual_Studio/Tango.Touch/Controls/MessageBoxVM.cs
index 55dc72bf9..06ae6f2a4 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/MessageBoxVM.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/MessageBoxVM.cs
@@ -15,15 +15,7 @@ namespace Tango.Touch.Controls
         /// <summary>
         /// Represents the available message notification types.
         /// </summary>
-        public enum MessageTypes
-        {
-            Info,
-            Success,
-            Warning,
-            Error,
-            Question,
-        }
-        public MessageTypes MessageType { get; set; } = MessageTypes.Info;
+        public Brush HeaderBrush { get; set; }
 
         public String Title { get; set; }
 
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml
index 0b72e8b85..1082bcf3b 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml
@@ -228,54 +228,7 @@
                                                 <Grid ClipToBounds="True">
                                                     <DockPanel>
                                                         <Grid DockPanel.Dock="Top">
-                                                            <Border CornerRadius="5 5 0 0"  BorderBrush="{StaticResource TangoGrayBrush}" BorderThickness="0 0 0 1" Padding="30">
-                                                                <Border.Style>
-                                                                    <Style TargetType="Border">
-                                                                       <Setter Property="Background">
-                                                                            <Setter.Value>
-                                                                                <SolidColorBrush Color="{StaticResource TangoPrimaryAccentColor}" Opacity="0.2"></SolidColorBrush>
-                                                                            </Setter.Value>
-                                                                        </Setter>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding MessageType}" Value="Info">
-                                                                                <Setter Property="Background">
-                                                                                    <Setter.Value>
-                                                                                        <SolidColorBrush Color="{StaticResource TangoPrimaryAccentColor}" Opacity="0.2"></SolidColorBrush>
-                                                                                    </Setter.Value>
-                                                                                </Setter>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding MessageType}" Value="Success">
-                                                                                <Setter Property="Background">
-                                                                                    <Setter.Value>
-                                                                                        <SolidColorBrush Color="{StaticResource TangoSuccessColor}" Opacity="0.2"></SolidColorBrush>
-                                                                                    </Setter.Value>
-                                                                                </Setter>
-                                                                                <Setter Property="BorderBrush" Value="{StaticResource TangoSuccessBrush}"></Setter>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding MessageType}" Value="Warning">
-                                                                                <Setter Property="Background">
-                                                                                    <Setter.Value>
-                                                                                        <SolidColorBrush Color="{StaticResource TangoWarningColor}" Opacity="0.2"></SolidColorBrush>
-                                                                                    </Setter.Value>
-                                                                                </Setter>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding MessageType}" Value="Error">
-                                                                                <Setter Property="Background">
-                                                                                    <Setter.Value>
-                                                                                        <SolidColorBrush Color="{StaticResource TangoErrorColor}" Opacity="0.2"></SolidColorBrush>
-                                                                                    </Setter.Value>
-                                                                                </Setter>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding MessageType}" Value="Question">
-                                                                                <Setter Property="Background">
-                                                                                    <Setter.Value>
-                                                                                        <SolidColorBrush Color="{StaticResource TangoPrimaryAccentColor}" Opacity="0.2"></SolidColorBrush>
-                                                                                    </Setter.Value>
-                                                                                </Setter>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </Border.Style>
+                                                            <Border CornerRadius="5 5 0 0"  BorderBrush="{StaticResource TangoGrayBrush}" BorderThickness="0 0 0 1" Padding="30" Background="{Binding HeaderBrush}">
                                                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                                                     <local:TouchIcon Width="24" Height="24" Icon="{Binding Icon}" Margin="0 0 20 0" Foreground="{Binding Brush}" />
                                                                     <TextBlock Text="{Binding Title}" FontSize="{StaticResource TangoMessageBoxTitleFontSize}" FontWeight="Normal"></TextBlock>
diff --git a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
index 0d01c6777..cbe0e3f0b 100644
--- a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
@@ -23,6 +23,6 @@
     <sys:Double x:Key="TangoComboBoxTitleFontSize">26</sys:Double>
     <sys:Double x:Key="TangoComboBoxItemFontSize">18</sys:Double>
 
-    <FontFamily x:Key="TangoFlexoMediumFontFamily">Flexo Medium</FontFamily>
-    <sys:Double x:Key="TangoMenuItemFontSize">22</sys:Double>
+    <sys:Double x:Key="TangoMenuItemFontSize">27</sys:Double>
+    <sys:Double x:Key="TangoLargeFontSize">50</sys:Double>
 </ResourceDictionary>
\ No newline at end of file
-- 
cgit v1.3.1