Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 09cc263

Browse files
committed
Use CommonControlsColors for PromptTextBox/SecurePasswordBox
Use standard Visual Studio colors for text boxes.
1 parent 44e439c commit 09cc263

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/GitHub.VisualStudio.UI/Styles/TextBlocks.xaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
4-
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
5-
xmlns:local="clr-namespace:GitHub.VisualStudio.Styles"
6-
xmlns:vsui="clr-namespace:GitHub.VisualStudio.UI">
4+
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
5+
xmlns:shell="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0">
76

87
<Style x:Key="GitHubVsPromptTextBox" TargetType="{x:Type ui:PromptTextBox}">
9-
<Setter Property="Background" Value="{DynamicResource GitHubVsBrandedUIBackground}"/>
10-
<Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}"/>
11-
<Setter Property="BorderBrush" Value="{DynamicResource GitHubVsBrandedUIBorder}"/>
8+
<Setter Property="Background" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBackgroundBrushKey}}"/>
9+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxTextBrushKey}}"/>
10+
<Setter Property="BorderBrush" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderBrushKey}}"/>
1211
<Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
1312
<Setter Property="HorizontalContentAlignment" Value="Left"/>
1413
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
@@ -31,7 +30,7 @@
3130
<Grid>
3231
<ScrollViewer x:Name="PART_ContentHost" Padding="{TemplateBinding Padding}" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" VerticalAlignment="Top" Margin="0"/>
3332
<Label x:Name="PromptLabel" HorizontalAlignment="Left"
34-
Foreground="{DynamicResource GitHubVsGrayText}"
33+
Foreground="{DynamicResource {x:Static shell:VsBrushes.GrayTextKey}}"
3534
FontSize="{TemplateBinding FontSize}" Padding="{TemplateBinding Padding}" Opacity="0"
3635
Target="{Binding ElementName=Bd}"
3736
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Focusable="False" IsHitTestVisible="False"

0 commit comments

Comments
 (0)