From 9d5cbb678c593f2150ea28d23cdc505cab21f004 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 12 Jul 2018 16:40:03 +0300
Subject: Machine Studio v1.0.0.13

---
 .../Resources/MaterialDesign.xaml                        | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
index ca0685f3c..07818269b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -3,6 +3,7 @@
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
                     xmlns:editors="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
                     xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop"
+                    xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:local="clr-namespace:Tango.MachineStudio.Common.Resources">
     <ResourceDictionary.MergedDictionaries>
@@ -65,7 +66,7 @@
             <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{DynamicResource Primary500Foreground}" />
             <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="{DynamicResource Primary500}" Opacity="0.4" />
         </ResourceDictionary>
-        
+
         <!--Fonts-->
         <ResourceDictionary>
             <FontFamily x:Key="digital-7">../Fonts/#digital-7</FontFamily>
@@ -181,7 +182,7 @@
                 </Setter>
             </Style>
 
-            
+
             <!--Extensions-->
 
             <FontFamily x:Key="FontName">Segoe UI</FontFamily>
@@ -391,8 +392,8 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-            
-            
+
+
             <!--Drag & Drop-->
             <Style x:Key="draggableGrid" TargetType="Grid">
                 <Setter Property="RenderTransform">
@@ -476,6 +477,13 @@
 
             <!--Extensions-->
 
+            <Style TargetType="{x:Type mahApps:NumericUpDown}" BasedOn="{StaticResource {x:Type mahApps:NumericUpDown}}">
+                <Style.Resources>
+                    <Style TargetType="TextBox"/>
+                </Style.Resources>
+            </Style>
+
+
         </ResourceDictionary>
 
     </ResourceDictionary.MergedDictionaries>
-- 
cgit v1.3.1