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

Commit e74eabc

Browse files
committed
Make work in designer and runtime
Move default PromptTextBox and SecurePasswordBox into same ResourceDictionary as GitHubVsPromptTextBox.
1 parent a5cd0b2 commit e74eabc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,7 @@
132132
</Setter>
133133
</Style>
134134

135+
<Style TargetType="{x:Type ui:PromptTextBox}" BasedOn="{StaticResource GitHubVsPromptTextBox}" />
136+
<Style TargetType="{x:Type ui:SecurePasswordBox}" BasedOn="{StaticResource GitHubVsPromptTextBox}" />
137+
135138
</ResourceDictionary>

src/GitHub.VisualStudio.UI/Views/Dialog/DialogStyles.xaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
<ResourceDictionary.MergedDictionaries>
66
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
77
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
8-
<ResourceDictionary Source="/Styles/TextBlocks.xaml" />
98
<StaticResource ResourceKey="ThemedDialogDefaultStylesKey"/>
109
</ResourceDictionary.MergedDictionaries>
11-
<Style TargetType="{x:Type ghfvs:PromptTextBox}" BasedOn="{StaticResource GitHubVsPromptTextBox}" />
12-
<Style TargetType="{x:Type ghfvs:SecurePasswordBox}" BasedOn="{StaticResource GitHubVsPromptTextBox}" />
1310
<Style TargetType="{x:Type TextBlock}" x:Key="GitHubH1TextBlock" BasedOn="{StaticResource TextBlockEnvironment200PercentFontSizeStyleKey}" />
1411
<Style TargetType="{x:Type TextBlock}" x:Key="GitHubDescriptionTextBlock" BasedOn="{StaticResource TextBlockEnvironment111PercentFontSizeStyleKey}" />
1512
<Style TargetType="{x:Type ghfvs:FilteredComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}" />

0 commit comments

Comments
 (0)