aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls
diff options
context:
space:
mode:
authorMirta <mirta@twine-s.com>2019-08-08 15:25:02 +0300
committerMirta <mirta@twine-s.com>2019-08-08 15:25:02 +0300
commitc7afd7e05b3230a4c652d74effd813b858da8ee3 (patch)
tree5e932dbdf668929ddc416b1706d5b481c2863ba2 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls
parentb112abfecb622ac7fcb7c161b03f450fbb58b00a (diff)
parentd627576c770ddab1079940c34057a55206f6a835 (diff)
downloadTango-c7afd7e05b3230a4c652d74effd813b858da8ee3.tar.gz
Tango-c7afd7e05b3230a4c652d74effd813b858da8ee3.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
index 692b3f818..7f135efbc 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
@@ -33,19 +33,19 @@
<RowDefinition Height="45"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
- <Button ToolTip="Increase Delta Resolution" Click="OnResolutionUpClicked" Style="{StaticResource MaterialDesignFlatButton}" Height="50" Padding="0" Foreground="#202020" VerticalAlignment="Bottom">
+ <Button ToolTip="Increase Delta Resolution" Click="OnResolutionUpClicked" Style="{StaticResource MaterialDesignFlatButton}" Height="50" Padding="0" Foreground="{StaticResource DarkGrayBrush}" VerticalAlignment="Bottom">
<materialDesign:PackIcon Kind="ArrowUp" Width="24" Height="24" />
</Button>
<Grid Grid.Row="1">
- <shapes:Hexagon Stroke="#202020" StrokeThickness="1" Margin="5" />
+ <shapes:Hexagon Stroke="{StaticResource DarkGrayBrush}" StrokeThickness="1" Margin="5" />
<TextBlock TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" FontStyle="Italic" FontSize="10">
<Run Text="&#916;"></Run>
<Run Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Resolution,FallbackValue=1}"></Run>
</TextBlock>
</Grid>
- <Button ToolTip="Decrease Delta Resolution" Click="OnResolutionDownClicked" Grid.Row="2" Style="{StaticResource MaterialDesignFlatButton}" Height="50" Padding="0" Foreground="#202020" VerticalAlignment="Top">
+ <Button ToolTip="Decrease Delta Resolution" Click="OnResolutionDownClicked" Grid.Row="2" Style="{StaticResource MaterialDesignFlatButton}" Height="50" Padding="0" Foreground="{StaticResource DarkGrayBrush}" VerticalAlignment="Top">
<materialDesign:PackIcon Kind="ArrowDown" Width="24" Height="24" />
</Button>
</Grid>