Skip to content

Commit eaf282b

Browse files
authored
fix(ui): apply VS theme colors to connection dialog (#316)
1 parent 9308cc5 commit eaf282b

File tree

1 file changed

+40
-2
lines changed

1 file changed

+40
-2
lines changed

src/CodingWithCalvin.CouchbaseExplorer/Dialogs/ConnectionDialog.xaml

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@
1010
SizeToContent="Height"
1111
ResizeMode="NoResize"
1212
WindowStartupLocation="CenterOwner"
13-
ShowInTaskbar="False">
13+
ShowInTaskbar="False"
14+
Background="{DynamicResource {x:Static vsshell:VsBrushes.WindowKey}}"
15+
Foreground="{DynamicResource {x:Static vsshell:VsBrushes.WindowTextKey}}">
1416

1517
<platformUi:DialogWindow.Resources>
1618
<vm:NullOrEmptyToVisibilityConverter x:Key="NullOrEmptyToVisibilityConverter" />
1719
<BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
1820

1921
<Style x:Key="ErrorTextStyle" TargetType="TextBlock">
20-
<Setter Property="Foreground" Value="#D32F2F" />
22+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vsshell:VsBrushes.ControlEditRequiredBackgroundKey}}" />
2123
<Setter Property="FontSize" Value="11" />
2224
<Setter Property="Margin" Value="0,2,0,0" />
2325
<Setter Property="TextWrapping" Value="Wrap" />
@@ -26,6 +28,7 @@
2628
<Style x:Key="LabelStyle" TargetType="TextBlock">
2729
<Setter Property="Margin" Value="0,0,0,4" />
2830
<Setter Property="FontWeight" Value="SemiBold" />
31+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vsshell:VsBrushes.WindowTextKey}}" />
2932
</Style>
3033

3134
<Style x:Key="FieldContainerStyle" TargetType="StackPanel">
@@ -35,6 +38,41 @@
3538
<Style x:Key="GroupBoxStyle" TargetType="GroupBox">
3639
<Setter Property="Margin" Value="0,0,0,12" />
3740
<Setter Property="Padding" Value="8" />
41+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vsshell:VsBrushes.WindowTextKey}}" />
42+
<Setter Property="BorderBrush" Value="{DynamicResource {x:Static vsshell:VsBrushes.AccentBorderKey}}" />
43+
</Style>
44+
45+
<Style TargetType="TextBox">
46+
<Setter Property="Background" Value="{DynamicResource {x:Static vsshell:VsBrushes.WindowKey}}" />
47+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vsshell:VsBrushes.WindowTextKey}}" />
48+
<Setter Property="BorderBrush" Value="{DynamicResource {x:Static vsshell:VsBrushes.AccentBorderKey}}" />
49+
<Setter Property="Padding" Value="4" />
50+
</Style>
51+
52+
<Style TargetType="PasswordBox">
53+
<Setter Property="Background" Value="{DynamicResource {x:Static vsshell:VsBrushes.WindowKey}}" />
54+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vsshell:VsBrushes.WindowTextKey}}" />
55+
<Setter Property="BorderBrush" Value="{DynamicResource {x:Static vsshell:VsBrushes.AccentBorderKey}}" />
56+
<Setter Property="Padding" Value="4" />
57+
</Style>
58+
59+
<Style TargetType="RadioButton">
60+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vsshell:VsBrushes.WindowTextKey}}" />
61+
</Style>
62+
63+
<Style TargetType="CheckBox">
64+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vsshell:VsBrushes.WindowTextKey}}" />
65+
</Style>
66+
67+
<Style TargetType="Button">
68+
<Setter Property="Background" Value="{DynamicResource {x:Static vsshell:VsBrushes.ButtonFaceKey}}" />
69+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vsshell:VsBrushes.ButtonTextKey}}" />
70+
<Setter Property="BorderBrush" Value="{DynamicResource {x:Static vsshell:VsBrushes.AccentBorderKey}}" />
71+
<Setter Property="Padding" Value="8,4" />
72+
</Style>
73+
74+
<Style TargetType="TextBlock">
75+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vsshell:VsBrushes.WindowTextKey}}" />
3876
</Style>
3977
</platformUi:DialogWindow.Resources>
4078

0 commit comments

Comments
 (0)