Merge branch 'fia' of bitbucket.org:bluetradesys/spark into fia

This commit is contained in:
Kevin Darby committed 2017-10-12 10:03:50 -04:00
commit dfc1b2b7d4
1 file changed
+4 -2
@@ -81,8 +81,8 @@
<TextBlock Grid.Column="4" Grid.Row="0" Text="{Binding open, Mode=OneWay}" FontWeight="Bold" />
<TextBlock Grid.Column="4" Grid.Row="1" Text="{Binding volume, Mode=OneWay}" FontWeight="Bold" />
<spark:RecenterCountdown Grid.Column="2" Grid.RowSpan="3"
Width="18" Height="18" Margin="4"
<spark:RecenterCountdown Grid.Column="5" Grid.RowSpan="2"
Width="16" Height="16" Margin="2"
Command="{Binding RecenterCommand, ElementName=_ladder}"
Foreground="Black" Background="Transparent" BorderBrush="Transparent" BorderThickness="0"
PieBackground="Black" SliceBackground="White" />
@@ -92,12 +92,14 @@
<Style TargetType="controls:Badge">
<Setter Property="Background" Value="{Binding background}" />
<Setter Property="BorderBrush" Value="{Binding border}" />
<Setter Property="Foreground" Value="Black" />
<Setter Property="Text" Value="{Binding text}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Width" Value="14" />
<Setter Property="Height" Value="8" />
<Setter Property="Margin" Value="1" />
<Setter Property="ToolTip" Value="{Binding summary}" />
<Setter Property="CornerRadius" Value="1" />
<Setter Property="ContextMenu">
<Setter.Value>
<ContextMenu>