diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-02-05 14:40:05 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-02-05 14:40:05 +0200 |
| commit | 97c1df6f802449daa37b259b8c440e474eaa4a28 (patch) | |
| tree | e69c54bbeed36e2484a71532c1145dc620d2e8df /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes | |
| parent | b9cadce8257cb9e567917c753ecafb4ee9c42ce1 (diff) | |
| download | Tango-97c1df6f802449daa37b259b8c440e474eaa4a28.tar.gz Tango-97c1df6f802449daa37b259b8c440e474eaa4a28.zip | |
Machine Studio. Set some colors in dialogs for Dark theme.
Removed gradientResolution from CreateJobRunLiquidQuantities.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes')
2 files changed, 10 insertions, 0 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 8dd4efc32..d9819e5ce 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml @@ -171,6 +171,7 @@ <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> @@ -269,6 +270,10 @@ <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 4ad992e67..95d55d63e 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml @@ -154,6 +154,7 @@ <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> @@ -215,6 +216,10 @@ <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>
\ No newline at end of file |