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

Commit c33cf75

Browse files
jcansdalejcansdale
committed
Use ThemedDialogColors instead of EnvironmentColors
1 parent b82778e commit c33cf75

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

‎src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog.Clone"
88
xmlns:uic="clr-namespace:GitHub.VisualStudio.UI.Controls"
99
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
10-
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
11-
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
10+
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
11+
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}"
1212
Margin="12,12"
1313
mc:Ignorable="d" d:DesignHeight="414" d:DesignWidth="440">
1414
<d:DesignData.DataContext>

‎src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositoryExecuteView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
VerticalAlignment="Top"
1111
Margin="8"
1212
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
13-
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
14-
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
13+
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
14+
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}"
1515
mc:Ignorable="d" d:DesignWidth="300" Height="315.179">
1616

1717
<Control.Resources>

‎src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositorySelectView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
1111
mc:Ignorable="d"
1212
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
13-
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
14-
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
13+
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
14+
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}"
1515
d:DesignHeight="414" d:DesignWidth="440">
1616

1717
<Control.Resources>

‎src/GitHub.VisualStudio.UI/Views/Dialog/GistCreationView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
d:DesignWidth="414"
1111
d:DesignHeight="440"
1212
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
13-
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
14-
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
13+
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
14+
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}"
1515
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.GistCreationControlCustom}">
1616
<Control.Resources>
1717
<ResourceDictionary Source="DialogStyles.xaml" />

‎src/GitHub.VisualStudio.UI/Views/Dialog/GitHubDialogWindow.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
MinWidth="414"
1515
MinHeight="460"
1616
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
17-
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
18-
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
17+
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
18+
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}"
1919
FontFamily="Segoe UI"
2020
FontSize="12"
2121
FontStretch="Normal"
@@ -45,7 +45,7 @@
4545
<DataTemplate>
4646
<Border MouseDown="Border_MouseDown"
4747
BorderThickness="1"
48-
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
48+
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
4949
BorderBrush="{DynamicResource {x:Static vs:ThemedDialogColors.WindowBorderBrushKey}}">
5050
<DockPanel>
5151
<!-- close button and padding -->

‎src/GitHub.VisualStudio.UI/Views/Dialog/LogOutRequiredView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:ghfvs="https://github.com/github/VisualStudio"
77
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
8-
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
9-
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
8+
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
9+
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}"
1010
mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">
1111

1212
<Control.Resources>

‎src/GitHub.VisualStudio.UI/Views/Dialog/Login2FaView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
d:DesignHeight="440"
1212
Style="{DynamicResource DialogUserControl}"
1313
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
14-
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
15-
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
14+
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
15+
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}"
1616
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TwoFactorAuthenticationCustom}" >
1717

1818
<Control.Resources>

‎src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
d:DesignHeight="440"
1212
Style="{DynamicResource DialogUserControl}"
1313
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
14-
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
15-
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
14+
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
15+
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}"
1616
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.SignInCustom}">
1717

1818
<Control.Resources>

‎src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
Style="{DynamicResource DialogUserControl}"
1212
mc:Ignorable="d"
1313
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
14-
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
15-
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
14+
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
15+
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}"
1616
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.RepositoryCreationControlCustom}" >
1717
<d:DesignProperties.DataContext>
1818
<Binding>

0 commit comments

Comments
 (0)