merge

2 files changed, 56 insertions, 66 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml
index d9819e5ce..8dd4efc32 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml
@@ -171,7 +171,6 @@
             <Color x:Key="graphGridLinesColor">#5C5C5C</Color>
             <Color x:Key="graphsMarkerColor">#5C5C5C</Color>
             <Color x:Key="materialColor">#FF03A9F4</Color>
-            <Color x:Key="whiteColor">#181818</Color>
             <!--Brushes-->
             <SolidColorBrush x:Key="borderBrush"
                              Color="{StaticResource borderColor}"></SolidColorBrush>
@@ -270,10 +269,6 @@
                 <GradientStop Color="#FEBDBDBD" Offset="0" />
                 <GradientStop Color="#004E4E4E" Offset="0.9" />
             </LinearGradientBrush>
-            <LinearGradientBrush x:Key="infoBrush" StartPoint="0.5,0" EndPoint="0.5,1">
-                <GradientStop Color="Black"/>
-                <GradientStop Color="#3C3C3C" Offset="1"/>
-            </LinearGradientBrush>
 
 
             <Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
index 95d55d63e..0f5727e5b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
@@ -9,20 +9,20 @@
         <ResourceDictionary>
             <system:Double x:Key = "HomeImageOpacity">1</system:Double>
             <SolidColorBrush x:Key="OrangeBrush" Color="#FFA300"/>
-            <SolidColorBrush x:Key="OrangeBrush200" Color="#FFA65F"/>
-            <SolidColorBrush x:Key="OrangeBrush250" Color="#E79F20"/>
+        <SolidColorBrush x:Key="OrangeBrush200" Color="#FFA65F"/>
+        <SolidColorBrush x:Key="OrangeBrush250" Color="#E79F20"/>
             <SolidColorBrush x:Key="OrangeCanceledBrush" Color="#EF832B"/>
             <!--Background for all duplicate buttons-->
             <SolidColorBrush x:Key="OrangeBrush300" Color="#FF9A6A"/>
-            <SolidColorBrush x:Key="OrangeBrush400" Color="#F38B76"/>
+        <SolidColorBrush x:Key="OrangeBrush400" Color="#F38B76"/>
 
-            <SolidColorBrush x:Key="RedBrush100" Color="#FF5151"/>
+        <SolidColorBrush x:Key="RedBrush100" Color="#FF5151"/>
             <SolidColorBrush x:Key="RedBrush200" Color="#FF6F6F"/>
             <!--Background for all remove/delete buttons-->
             <SolidColorBrush x:Key="RedBrush300" Color="#FF7272"/>
-            <SolidColorBrush x:Key="RedBrush400" Color="#FF8585"/>
-            <SolidColorBrush x:Key="RedBrush500" Color="#E14141"/>
-            <SolidColorBrush x:Key="OrangeUploadBrush" Color="#E76311"/>
+        <SolidColorBrush x:Key="RedBrush400" Color="#FF8585"/>
+        <SolidColorBrush x:Key="RedBrush500" Color="#E14141"/>
+         <SolidColorBrush x:Key="OrangeUploadBrush" Color="#E76311"/>
 
 
             <SolidColorBrush x:Key="GreenBrush" Color="#04CB04"/>
@@ -40,72 +40,72 @@
 
 
             <SolidColorBrush x:Key="DarkBlueBrush" Color="#3C7EF4"/>
-            <SolidColorBrush x:Key="DodgerBlueBrush" Color="DodgerBlue"/>
-            <SolidColorBrush x:Key="BlueBrush100" Color="#03A9F4" />
-            <SolidColorBrush x:Key="BlueBrush" Color="#64B8EC"/>
-            <SolidColorBrush x:Key="BlueSelectionStrokBrush" Color="#1EA9FF"/>
+        <SolidColorBrush x:Key="DodgerBlueBrush" Color="DodgerBlue"/>
+        <SolidColorBrush x:Key="BlueBrush100" Color="#03A9F4" />
+        <SolidColorBrush x:Key="BlueBrush" Color="#64B8EC"/>
+        <SolidColorBrush x:Key="BlueSelectionStrokBrush" Color="#1EA9FF"/>
 
-            <SolidColorBrush x:Key="LilacBrush" Color="#833CEC"/>
-            <SolidColorBrush x:Key="LilacBrush100" Color="#682EBE"/>
-            <SolidColorBrush x:Key="LilacBrush200" Color="#532990"/>
+        <SolidColorBrush x:Key="LilacBrush" Color="#833CEC"/>
+        <SolidColorBrush x:Key="LilacBrush100" Color="#682EBE"/>
+        <SolidColorBrush x:Key="LilacBrush200" Color="#532990"/>
 
-            <SolidColorBrush x:Key="WhiteTextBrush" Color="White"/>
-            <SolidColorBrush x:Key="WhiteBackgroundBrush" Color="White"/>
-            <SolidColorBrush x:Key="WhiteBrush" Color="#E6FFFFFF"/>
-            <SolidColorBrush x:Key="WhiteBrush50" Color="#FFF1F1F1"/>
-
-            <SolidColorBrush x:Key="WhiteBrush100" Color="#ECECEC"/>
-            <SolidColorBrush x:Key="LightGrayBrush" Color="#A5A4A4"/>
-            <SolidColorBrush x:Key="LightGrayBrush100" Color="#BBBBBB"/>
-            <SolidColorBrush x:Key="LightGrayBrush150" Color="#CBCBCB"/>
-            <SolidColorBrush x:Key="LightGrayBrush200" Color="#D9D9D9"/>
+        <SolidColorBrush x:Key="WhiteTextBrush" Color="White"/>
+        <SolidColorBrush x:Key="WhiteBackgroundBrush" Color="White"/>
+        <SolidColorBrush x:Key="WhiteBrush" Color="#E6FFFFFF"/>
+        <SolidColorBrush x:Key="WhiteBrush50" Color="#FFF1F1F1"/>
+            
+        <SolidColorBrush x:Key="WhiteBrush100" Color="#ECECEC"/>
+        <SolidColorBrush x:Key="LightGrayBrush" Color="#A5A4A4"/>
+        <SolidColorBrush x:Key="LightGrayBrush100" Color="#BBBBBB"/>
+        <SolidColorBrush x:Key="LightGrayBrush150" Color="#CBCBCB"/>
+        <SolidColorBrush x:Key="LightGrayBrush200" Color="#D9D9D9"/>
 
             <!-- used for regular text color -->
-            <SolidColorBrush x:Key="BlackForegroundBrush" Color="black"/>
-            <SolidColorBrush x:Key="DarkGrayBrush" Color="#1B1B1B"/>
-            <SolidColorBrush x:Key="DarkGrayBrush100" Color="#101010"/>
-            <SolidColorBrush x:Key="DarkGrayBrush200" Color="#202020"/>
-            <SolidColorBrush x:Key="GrayBrush300" Color="#303030"/>
+        <SolidColorBrush x:Key="BlackForegroundBrush" Color="black"/>
+        <SolidColorBrush x:Key="DarkGrayBrush" Color="#1B1B1B"/>
+        <SolidColorBrush x:Key="DarkGrayBrush100" Color="#101010"/>
+        <SolidColorBrush x:Key="DarkGrayBrush200" Color="#202020"/>
+        <SolidColorBrush x:Key="GrayBrush300" Color="#303030"/>
             <!--used for Foreground Storage-->
-            <SolidColorBrush x:Key="GrayBrush310" Color="#363636"/>
-            <SolidColorBrush x:Key="GrayBrush280" Color="#3E3E3E"/>
-            <SolidColorBrush x:Key="GrayBrush290" Color="#404040"/>
-            <!-- used for text color-->
-            <SolidColorBrush x:Key="GrayBrush250" Color="#5E5E5E"/>
-            <SolidColorBrush x:Key="GrayBrush200" Color="#616161"/>
-            <SolidColorBrush x:Key="GrayBrush50" Color="#7A7A7A"/>
-            <SolidColorBrush x:Key="GrayBrush" Color="Gray"/>
-            <SolidColorBrush x:Key="DimGrayBrush" Color="DimGray"/>
+        <SolidColorBrush x:Key="GrayBrush310" Color="#363636"/>
+        <SolidColorBrush x:Key="GrayBrush280" Color="#3E3E3E"/>
+        <SolidColorBrush x:Key="GrayBrush290" Color="#404040"/>
+         <!-- used for text color-->
+        <SolidColorBrush x:Key="GrayBrush250" Color="#5E5E5E"/>
+        <SolidColorBrush x:Key="GrayBrush200" Color="#616161"/>
+        <SolidColorBrush x:Key="GrayBrush50" Color="#7A7A7A"/>
+        <SolidColorBrush x:Key="GrayBrush" Color="Gray"/>
+        <SolidColorBrush x:Key="DimGrayBrush" Color="DimGray"/>
             <SolidColorBrush x:Key="SideBarBackgroundBrush" Color="white" />
             <SolidColorBrush x:Key="JobFieldForeground" Color="#FF494949"/>
             <SolidColorBrush x:Key="HomePageForeground" Color="#FF494949"/>
 
             <!--used for border brush-->
             <SolidColorBrush x:Key="BorderBrushGainsboro" Color="Gainsboro"/>
-
+         
 
 
             <LinearGradientBrush x:Key="BlueGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
-                <GradientStop Color="#03A9F4"/>
-                <GradientStop Color="#0081BB" Offset="1"/>
-            </LinearGradientBrush>
+            <GradientStop Color="#03A9F4"/>
+            <GradientStop Color="#0081BB" Offset="1"/>
+        </LinearGradientBrush>
 
-            <SolidColorBrush x:Key="TransparentBackgroundBrush" Color="#96FFFFFF"/>
-            <SolidColorBrush x:Key="TransparentBackgroundBrush100" Color="#B9FFFFFF"/>
-            <SolidColorBrush x:Key="TransparentBackgroundBrush200" Color="#E6FFFFFF"/>
-            <SolidColorBrush x:Key="TransparentBackgroundBrush300" Color="#D4FFFFFF"/>
-            <SolidColorBrush x:Key="Transparent200" Color="#C9F6F6F6"/>
-            <!--MachineJobSelectionView Grid Background-->
-            <SolidColorBrush x:Key="TransparentBackgroundBrush400" Color="#B1FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush" Color="#96FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush100" Color="#B9FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush200" Color="#E6FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush300" Color="#D4FFFFFF"/>
+        <SolidColorBrush x:Key="Transparent200" Color="#C9F6F6F6"/>
+         <!--MachineJobSelectionView Grid Background-->
+        <SolidColorBrush x:Key="TransparentBackgroundBrush400" Color="#B1FFFFFF"/>
             <SolidColorBrush x:Key="TransparentBackgroundBrush420" Color="#A6FFFFFF"/>
-
-            <!--Storage.Views.MainView-->
+            
+        <!--Storage.Views.MainView-->
             <SolidColorBrush x:Key="TransparentBackgroundBrush500" Color="#8BFFFFFF"/>
 
             <!--MachineTechView-->
-            <SolidColorBrush x:Key="TransparentBackgroundBrush450" Color="#7EFFFFFF"/>
-            <SolidColorBrush x:Key="TransparentBackgroundBrush600" Color="#70FFFFFF"/>
-            <SolidColorBrush x:Key="SelectionFillBrush" Color="#338D8D8D"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush450" Color="#7EFFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush600" Color="#70FFFFFF"/>
+        <SolidColorBrush x:Key="SelectionFillBrush" Color="#338D8D8D"/>
             <!--Dispenser background-->
             <SolidColorBrush x:Key="TransparentBackgroundBrush700" Color="#68F6F6F6"/>
 
@@ -154,7 +154,6 @@
             <Color x:Key="graphGridLinesColor">#FF464646</Color>
             <Color x:Key="graphsMarkerColor">Gray</Color>
             <Color x:Key="materialColor">#FF03A9F4</Color>
-            <Color x:Key="whiteColor">White</Color>
             <!--Brushes-->
             <SolidColorBrush x:Key="borderBrush" Color="{StaticResource borderColor}"></SolidColorBrush>
             <SolidColorBrush x:Key="graphGridLinesBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
@@ -162,7 +161,7 @@
             <SolidColorBrush x:Key="graphGridLinesLightBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
             <SolidColorBrush x:Key="graphGridLinesDarkBrush" Color="#FF2E2E2E"></SolidColorBrush>
             <SolidColorBrush x:Key="MaterialDesignFlatButtonClick" Color="#FFDEDEDE"></SolidColorBrush>
-
+           
             <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackgroundLight">
                 <GradientStop Color="White"/>
                 <GradientStop Color="#FFE9E9E9" Offset="1"/>
@@ -216,10 +215,6 @@
                 <GradientStop Color="#00EEEEEE" Offset="0" />
                 <GradientStop Color="#FFB5B5B5" Offset="1" />
             </LinearGradientBrush>
-            <LinearGradientBrush x:Key="infoBrush" StartPoint="0.5,0" EndPoint="0.5,1">
-                <GradientStop Color="White"/>
-                <GradientStop Color="#FFBFBFBF" Offset="1"/>
-            </LinearGradientBrush>
         </ResourceDictionary>
-    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file