DynamoDS
diff --git a/‎src/DynamoCoreWpf/Controls/RunSettingsControl.xaml
Copy file name to clipboard
-62Lines changed: 0 additions & 62 deletions b/‎src/DynamoCoreWpf/Controls/RunSettingsControl.xaml
Copy file name to clipboard
-62Lines changed: 0 additions & 62 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
Copy file name to clipboard
+62Lines changed: 62 additions & 0 deletions b/‎src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
Copy file name to clipboard
+62Lines changed: 62 additions & 0 deletions
diff --git a/‎src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml
Copy file name to clipboard
+3-65Lines changed: 3 additions & 65 deletions b/‎src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml
Copy file name to clipboard
+3-65Lines changed: 3 additions & 65 deletions
@@ -33,68 +33,6 @@
             </ObjectDataProvider>
 
             <viewModels:RunPeriodConverter x:Key="RunPeriodConverter" />
-            <Style x:Key="RunButtonStyle"
-                   TargetType="{x:Type Button}">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Border x:Name="container"
-                                    Background="Transparent"
-                                    BorderBrush="#FF23A597"
-                                    CornerRadius="2"
-                                    BorderThickness="1">
-                                <Grid x:Name="inner"
-                                      Background="#FF23A597">
-                                    <TextBlock x:Name="text"
-                                               HorizontalAlignment="Center"
-                                               VerticalAlignment="Center"
-                                               FontSize="14px"
-                                               Foreground="#FFFFFF"
-                                               Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}" />
-                                </Grid>
-                            </Border>
-
-                            <ControlTemplate.Triggers>
-
-                                <Trigger Property="Button.IsMouseOver"
-                                         Value="true">
-                                    <Setter TargetName="container"
-                                            Property="BorderBrush"
-                                            Value="#26808080" />
-                                    <Setter TargetName="container"
-                                            Property="BorderThickness"
-                                            Value="2" />
-                                </Trigger>
-
-                                <Trigger Property="Button.IsPressed"
-                                         Value="true">
-                                    <Setter TargetName="container"
-                                            Property="BorderBrush"
-                                            Value="#40808080" />
-                                    <Setter TargetName="container"
-                                            Property="BorderThickness"
-                                            Value="4" />
-                                </Trigger>
-
-                                <Trigger Property="Button.IsEnabled"
-                                         Value="false">
-                                    <Setter TargetName="inner"
-                                            Property="Background"
-                                            Value="#218d81" />
-                                    <Setter TargetName="text"
-                                            Property="Foreground"
-                                            Value="#bebebe" />
-                                    <Setter TargetName="container"
-                                            Property="BorderBrush"
-                                            Value="#218d81" />
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
         </ResourceDictionary>
     </UserControl.Resources>
 
 
@@ -198,6 +198,9 @@
     <!--  TextBlock ToolTip color -->
     <SolidColorBrush x:Key="TextBlockToolTipDescriptionColor" Color="{StaticResource DarkerGrey}" />
 
+    <!--  TextEditor brush color -->
+    <SolidColorBrush x:Key="TextEditorBrush" Color="#353535" />
+    
     <!--  Custom ToolTip border color  -->
     <SolidColorBrush x:Key="CustomToolTipBorderColor" Color="#808080" />
 </ResourceDictionary>
@@ -5785,4 +5785,66 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+
+    <Style x:Key="RunButtonStyle"
+                   TargetType="{x:Type Button}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border x:Name="container"
+                                    Background="Transparent"
+                                    BorderBrush="#FF23A597"
+                                    CornerRadius="2"
+                                    BorderThickness="1">
+                        <Grid x:Name="inner"
+                                      Background="#FF23A597">
+                            <TextBlock x:Name="text"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               FontSize="14px"
+                                               Foreground="#FFFFFF"
+                                               Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}" />
+                        </Grid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+
+                        <Trigger Property="Button.IsMouseOver"
+                                         Value="true">
+                            <Setter TargetName="container"
+                                            Property="BorderBrush"
+                                            Value="#26808080" />
+                            <Setter TargetName="container"
+                                            Property="BorderThickness"
+                                            Value="2" />
+                        </Trigger>
+
+                        <Trigger Property="Button.IsPressed"
+                                         Value="true">
+                            <Setter TargetName="container"
+                                            Property="BorderBrush"
+                                            Value="#40808080" />
+                            <Setter TargetName="container"
+                                            Property="BorderThickness"
+                                            Value="4" />
+                        </Trigger>
+
+                        <Trigger Property="Button.IsEnabled"
+                                         Value="false">
+                            <Setter TargetName="inner"
+                                            Property="Background"
+                                            Value="#218d81" />
+                            <Setter TargetName="text"
+                                            Property="Foreground"
+                                            Value="#bebebe" />
+                            <Setter TargetName="container"
+                                            Property="BorderBrush"
+                                            Value="#218d81" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
@@ -59,68 +59,6 @@
                 <Setter Property="Foreground" Value="#bbbbbb" />
             </Style>
 
-            <Style x:Key="SaveButtonStyle"
-                   TargetType="{x:Type Button}"
-                   BasedOn="{StaticResource CtaButtonStyle}">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Border x:Name="container"
-                                    Background="Transparent"
-                                    BorderBrush="#FF23A597"
-                                    CornerRadius="2"
-                                    BorderThickness="1">
-                                <Grid x:Name="inner"
-                                      Background="#FF23A597">
-                                    <TextBlock x:Name="text"
-                                               HorizontalAlignment="Center"
-                                               VerticalAlignment="Center"
-                                               FontSize="14px"
-                                               Foreground="#FFFFFF"
-                                               Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}" />
-                                </Grid>
-                            </Border>
-
-                            <ControlTemplate.Triggers>
-
-                                <Trigger Property="Button.IsMouseOver"
-                                         Value="true">
-                                    <Setter TargetName="container"
-                                            Property="BorderBrush"
-                                            Value="#26808080" />
-                                    <Setter TargetName="container"
-                                            Property="BorderThickness"
-                                            Value="2" />
-                                </Trigger>
-
-                                <Trigger Property="Button.IsPressed"
-                                         Value="true">
-                                    <Setter TargetName="container"
-                                            Property="BorderBrush"
-                                            Value="#40808080" />
-                                    <Setter TargetName="container"
-                                            Property="BorderThickness"
-                                            Value="4" />
-                                </Trigger>
-
-                                <Trigger Property="Button.IsEnabled"
-                                         Value="false">
-                                    <Setter TargetName="inner"
-                                            Property="Background"
-                                            Value="#218d81" />
-                                    <Setter TargetName="text"
-                                            Property="Foreground"
-                                            Value="#bebebe" />
-                                    <Setter TargetName="container"
-                                            Property="BorderBrush"
-                                            Value="#218d81" />
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
             <Style x:Key="UnSaveButtonStyle"
                    TargetType="{x:Type Button}"
                    BasedOn="{StaticResource CtaButtonStyle}">
@@ -237,7 +175,7 @@
                                 Style="{StaticResource RestoreButtonDarkStyle}" />
 
                         <Button Name="UndockButton"
-                                Click="OnDockButtonClicked"
+                                Click="OnDockButtonClicked" 
                                 Margin="0 0 20 0"
                                 DockPanel.Dock="Right"
                                 Style="{StaticResource DockButtonDarkStyle}" >
@@ -402,7 +340,7 @@
                                            FontFamily="{StaticResource SourceCodePro}"
                                            FontSize="10pt"
                                            ShowLineNumbers="True"
-                                           Background="{StaticResource ExtensionBackgroundColor}"
+                                           Background="{StaticResource TextEditorBrush}"
                                            Foreground="{StaticResource AutocompletionWindowFontColor}"
                                            Padding="5"
                                            HorizontalScrollBarVisibility="Disabled"
@@ -424,7 +362,7 @@
                             MinWidth="90"
                             Width="140"
                             Height="45"
-                            Style="{StaticResource SaveButtonStyle}" 
+                            Style="{StaticResource RunButtonStyle}" 
                             Name="RunPythonScriptButton"
                             Click="OnRunClicked">
                         <Button.ToolTip>