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

Commit 4e20b0f

Browse files
jcansdalejcansdale
committed
Use EnvironmentColors instead of VsBrush
1 parent 7f28aba commit 4e20b0f

File tree

10 files changed

+27
-20
lines changed

10 files changed

+27
-20
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
77
xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog.Clone"
88
xmlns:uic="clr-namespace:GitHub.VisualStudio.UI.Controls"
9-
Background="{DynamicResource VsBrush.Window}"
10-
Foreground="{DynamicResource VsBrush.WindowText}"
9+
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}}"
1112
mc:Ignorable="d" d:DesignHeight="414" d:DesignWidth="440">
1213
<d:DesignData.DataContext>
1314
<ghfvs:RepositoryCloneViewModelDesigner/>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog.Clone"
76
xmlns:ghfvs="https://github.com/github/VisualStudio"
87
mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="400">
98
<d:DesignData.DataContext>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
xmlns:ui="https://github.com/github/VisualStudio"
1010
VerticalAlignment="Top"
1111
Margin="8"
12-
xmlns:cache="clr-namespace:GitHub.UI.Helpers;assembly=GitHub.UI"
13-
Background="{DynamicResource VsBrush.Window}"
14-
Foreground="{DynamicResource VsBrush.WindowText}"
12+
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}}"
1515
mc:Ignorable="d" d:DesignWidth="300" Height="315.179">
1616

1717
<Control.Resources>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog"
1010
xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
1111
mc:Ignorable="d"
12-
Background="{DynamicResource VsBrush.Window}"
13-
Foreground="{DynamicResource VsBrush.WindowText}"
12+
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}}"
1415
d:DesignHeight="414" d:DesignWidth="440">
1516

1617
<Control.Resources>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
mc:Ignorable="d"
99
d:DesignWidth="414"
1010
d:DesignHeight="440"
11-
Background="{DynamicResource VsBrush.Window}"
12-
Foreground="{DynamicResource VsBrush.WindowText}"
11+
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
12+
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
13+
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
1314
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.GistCreationControlCustom}">
1415
<Control.Resources>
1516
<ResourceDictionary Source="DialogStyles.xaml" />

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
Height="460"
1313
MinWidth="414"
1414
MinHeight="460"
15-
Background="{DynamicResource VsBrush.Window}"
15+
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
16+
Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
17+
Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
1618
FontFamily="Segoe UI"
1719
FontSize="12"
1820
FontStretch="Normal"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:ghfvs="https://github.com/github/VisualStudio"
7-
xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI"
8-
Background="{DynamicResource VsBrush.Window}"
9-
Foreground="{DynamicResource VsBrush.WindowText}"
7+
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}}"
1010
mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">
1111

1212
<Control.Resources>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
d:DesignWidth="414"
1010
d:DesignHeight="440"
1111
Style="{DynamicResource DialogUserControl}"
12-
Background="{DynamicResource VsBrush.Window}"
13-
Foreground="{DynamicResource VsBrush.WindowText}"
12+
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}}"
1415
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TwoFactorAuthenticationCustom}" >
1516

1617
<Control.Resources>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
d:DesignWidth="414"
1010
d:DesignHeight="440"
1111
Style="{DynamicResource DialogUserControl}"
12-
Background="{DynamicResource VsBrush.Window}"
13-
Foreground="{DynamicResource VsBrush.WindowText}"
12+
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}}"
1415
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.SignInCustom}">
1516

1617
<Control.Resources>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
d:DesignWidth="414"
1010
Style="{DynamicResource DialogUserControl}"
1111
mc:Ignorable="d"
12-
Background="{DynamicResource VsBrush.Window}"
13-
Foreground="{DynamicResource VsBrush.WindowText}"
12+
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}}"
1415
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.RepositoryCreationControlCustom}" >
1516
<d:DesignProperties.DataContext>
1617
<Binding>

0 commit comments

Comments
 (0)