diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-08-15 10:45:25 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-08-15 10:45:25 +0300 |
| commit | ce51bf994fa0896018544698a60fd0740a05293b (patch) | |
| tree | 42d30252b3a6f7e19a0378251e05630834e6d60f /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml | |
| parent | 733f0ce4feef6b7dc4151ffe0f896efb53640314 (diff) | |
| parent | 723e2b8854db8c409268f31ab76f5252211ec494 (diff) | |
| download | Tango-ce51bf994fa0896018544698a60fd0740a05293b.tar.gz Tango-ce51bf994fa0896018544698a60fd0740a05293b.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
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.xaml | 4 |
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"> |