diff options
| author | Mirta <mirta@twine-s.com> | 2019-08-08 15:25:02 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2019-08-08 15:25:02 +0300 |
| commit | c7afd7e05b3230a4c652d74effd813b858da8ee3 (patch) | |
| tree | 5e932dbdf668929ddc416b1706d5b481c2863ba2 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows | |
| parent | b112abfecb622ac7fcb7c161b03f450fbb58b00a (diff) | |
| parent | d627576c770ddab1079940c34057a55206f6a835 (diff) | |
| download | Tango-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.UI/Windows')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml | 4 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml index 147b40892..a1c58aab2 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml @@ -43,7 +43,7 @@ </Grid> <Grid Grid.Row="1" Margin="0 10 0 0"> - <TextBox Style="{x:Null}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderBrush="#515151" IsReadOnly="True" AcceptsReturn="True" Foreground="#202020" Padding="2" TextWrapping="Wrap" Text="{Binding Exception}"></TextBox> + <TextBox Style="{x:Null}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderBrush="{StaticResource GrayBrush200}" IsReadOnly="True" AcceptsReturn="True" Foreground="{StaticResource DarkGrayBrush}" Padding="2" TextWrapping="Wrap" Text="{Binding Exception}"></TextBox> </Grid> </Grid> @@ -55,7 +55,7 @@ <Button x:Name="btnReport" Style="{StaticResource MaterialDesignFlatButton}" Width="150" Command="{Binding ResolveCommand}" CommandParameter="{x:Static local:ExceptionResolutions.Report}"> <StackPanel Orientation="Horizontal"> <Image Source="/Images/bug.png" RenderOptions.BitmapScalingMode="Fant"></Image> - <TextBlock Foreground="#FF5C5C" Margin="10 0 0 0" VerticalAlignment="Center">Report Issue</TextBlock> + <TextBlock Foreground="{StaticResource RedBrush100}" Margin="10 0 0 0" VerticalAlignment="Center">Report Issue</TextBlock> </StackPanel> </Button> <Button Margin="5 0 0 0" Width="140" Command="{Binding ResolveCommand}" CommandParameter="{x:Static local:ExceptionResolutions.Shutdown}">Shutdown</Button> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml index 8721cfd6a..d53cb934e 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml @@ -51,6 +51,7 @@ <Border HorizontalAlignment="Right" Margin="0 -1 10 0" VerticalAlignment="Top" Width="300" Height="40" Padding="5" CornerRadius="0 0 30 30" BorderThickness="1 0 1 1" BorderBrush="DimGray"> <Border.Style> <Style TargetType="Border"> + <!--<Setter Property="Background" Value="{StaticResource BlueGradientBrush}"/>--> <Setter Property="RenderTransform"> <Setter.Value> <ScaleTransform ScaleX="1" ScaleY="0"></ScaleTransform> @@ -78,7 +79,7 @@ </Border.Style> <Border.Background> <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1"> - <GradientStop Color="#03A9F4"/> + <GradientStop Color="#FF03A9F4"/> <GradientStop Color="#0081BB" Offset="1"/> </LinearGradientBrush> </Border.Background> |