aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Modules
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-05-29 12:08:10 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-05-29 12:08:10 +0300
commit6792c8f8769eec18cfee8ccf80a09887c48b8b6a (patch)
treeeb67c141d40ea34b4446bd6724ec77fc13385852 /Software/Visual_Studio/PPC/Modules
parent9ae8d0e95a199dbf6be4597b0e08717d4d0754f2 (diff)
parent405096b3d489f4ea7b50b1d5db7d32241251b8d7 (diff)
downloadTango-6792c8f8769eec18cfee8ccf80a09887c48b8b6a.tar.gz
Tango-6792c8f8769eec18cfee8ccf80a09887c48b8b6a.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules')
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml12
1 files changed, 6 insertions, 6 deletions
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 136644f5c..da46f31ff 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
@@ -491,7 +491,7 @@
</touch:TouchExpander>
</touch:TouchVirtualizedContentControl>
- <Border Style="{StaticResource TangoTouchBorder}" Margin="0 12 0 0" Padding="0 0 0 40">
+ <touch:TouchDropShadowBorder Margin="0 12 0 0" Padding="0 0 0 40">
<Grid>
<StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}">
@@ -614,10 +614,10 @@
</DockPanel>
</StackPanel>
</Grid>
- </Border>
+ </touch:TouchDropShadowBorder>
<touch:TouchVirtualizedContentControl Margin="0 20 0 0">
- <Border Style="{StaticResource TangoTouchBorder}" Padding="0 0 0 50" Visibility="{Binding Job.EmbroideryFileData,Converter={StaticResource IsNullToVisibilityConverter}}">
+ <touch:TouchDropShadowBorder Padding="0 0 0 50" Visibility="{Binding Job.EmbroideryFileData,Converter={StaticResource IsNullToVisibilityConverter}}">
<StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}">
<Image Source="../Images/embroidery.png" RenderOptions.BitmapScalingMode="Fant" Width="39" />
@@ -635,11 +635,11 @@
</DockPanel>
</StackPanel>
</StackPanel>
- </Border>
+ </touch:TouchDropShadowBorder>
</touch:TouchVirtualizedContentControl>
<touch:TouchVirtualizedContentControl Margin="0 20 0 0" >
- <Border Style="{StaticResource TangoTouchBorder}" Padding="0 0 0 50">
+ <touch:TouchDropShadowBorder Padding="0 0 0 50">
<StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}">
<Image Source="../Images/JobView/job-summary.png" Width="39" />
@@ -687,7 +687,7 @@
</DockPanel>
</StackPanel>
</StackPanel>
- </Border>
+ </touch:TouchDropShadowBorder>
</touch:TouchVirtualizedContentControl>
<StackPanel HorizontalAlignment="Center" Margin="20 40 0 40" Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}">