aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-08-13 19:29:04 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-08-13 19:29:04 +0300
commitbad27bfb9f964ec404f421aa412e6f37804815c1 (patch)
tree5867c4a9773855397e708ff7290e0103e17d198e /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
parentabc2f5fc8f757eddeccdd10646039c96b58e522d (diff)
parentd2e231dbe55d7fcae6aa53caf78f72bd58784a98 (diff)
downloadTango-bad27bfb9f964ec404f421aa412e6f37804815c1.tar.gz
Tango-bad27bfb9f964ec404f421aa412e6f37804815c1.zip
merge
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
index 3073d0b62..e7f16146b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
@@ -220,7 +220,7 @@
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
- <Border BorderBrush="Gray" BorderThickness="1 0 0 0" Background="White">
+ <Border BorderBrush="Gray" BorderThickness="1 0 0 0" Background="{StaticResource WhiteBrush}">
<Grid>
<ScrollViewer Padding="20" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<controls:JobOutlineControl HorizontalAlignment="Left" DataContext="{Binding JobHandler.JobTicket}" VirtualizingStackPanel.IsVirtualizing="True"/>
@@ -237,7 +237,7 @@
</ContentControl>
- <Border VerticalAlignment="Center" HorizontalAlignment="Left" Background="White" Width="30" Height="120" CornerRadius="10 0 0 10" Margin="-28 0 0 0" BorderBrush="Gray" BorderThickness="1 1 0 1">
+ <Border VerticalAlignment="Center" HorizontalAlignment="Left" Background="{StaticResource WhiteBrush}" Width="30" Height="120" CornerRadius="10 0 0 10" Margin="-28 0 0 0" BorderBrush="Gray" BorderThickness="1 1 0 1">
<ToggleButton x:Name="toggleOutline" BorderThickness="0" Cursor="Hand" Background="Transparent">
<ToggleButton.Style>
<Style TargetType="ToggleButton">