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

Commit 99253ff

Browse files
jcansdalejcansdale
authored
Merge branch 'master' into fixes/rehostable-JoinableTaskContext
2 parents a5ad053 + 8783e10 commit 99253ff

File tree

6 files changed

+101
-3
lines changed

6 files changed

+101
-3
lines changed

‎src/GitHub.InlineReviews/Properties/DesignTimeResources.xaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/Dark/ThemedDialogColors.xaml" />
99
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/Dark/EnvironmentColors.xaml" />
1010
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/Dark/TreeViewColors.xaml" />
11+
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/FontScalingLabelStyle.xaml" />
12+
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/FontScalingTextBlockStyle.xaml" />
1113
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/CommonControlsButtonStyle.xaml" />
1214
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/CommonControlsCheckboxStyle.xaml" />
1315
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/CommonControlsComboboxStyle.xaml" />

‎src/GitHub.UI.Reactive/Assets/Controls/ErrorMessageDisplay.xaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns:uirx="clr-namespace:GitHub.UI">
55

66
<Style x:Key="ErrorMessageStyle" TargetType="{x:Type uirx:ErrorMessageDisplay}">
7-
<Setter Property="Foreground" Value="{DynamicResource GHTextBrush}" />
87
<Setter Property="IconFill" Value="{DynamicResource GitHubErrorBrush}" />
98
<Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
109
<Setter Property="Template">

‎src/GitHub.VisualStudio.UI/Properties/DesignTimeResources.xaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<ResourceDictionary Source="/Themes/Dark/ThemedDialogColors.xaml" />
99
<ResourceDictionary Source="/Themes/Dark/EnvironmentColors.xaml" />
1010
<ResourceDictionary Source="/Themes/Dark/TreeViewColors.xaml" />
11+
<ResourceDictionary Source="/Themes/FontScalingLabelStyle.xaml" />
12+
<ResourceDictionary Source="/Themes/FontScalingTextBlockStyle.xaml" />
1113
<ResourceDictionary Source="/Themes/CommonControlsButtonStyle.xaml" />
1214
<ResourceDictionary Source="/Themes/CommonControlsCheckboxStyle.xaml" />
1315
<ResourceDictionary Source="/Themes/CommonControlsComboboxStyle.xaml" />

‎src/GitHub.VisualStudio.UI/Themes/FontScalingLabelStyle.xaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<ResourceDictionary
2+
x:Uid="ResourceDictionary_1" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0">
5+
6+
<Style x:Uid="Style_1" TargetType="{x:Type Label}" x:Key="{x:Static vsfx:VsResourceKeys.LabelEnvironment375PercentFontSizeStyleKey}">
7+
<Setter x:Uid="Setter_1" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment375PercentFontSizeKey}}" />
8+
<Setter x:Uid="Setter_2" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment375PercentFontWeightKey}}" />
9+
<Setter x:Uid="Setter_3" Property="TextOptions.TextFormattingMode" Value="Ideal" />
10+
</Style>
11+
12+
<Style x:Uid="Style_2" TargetType="{x:Type Label}" x:Key="{x:Static vsfx:VsResourceKeys.LabelEnvironment310PercentFontSizeStyleKey}">
13+
<Setter x:Uid="Setter_4" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment310PercentFontSizeKey}}" />
14+
<Setter x:Uid="Setter_5" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment310PercentFontWeightKey}}" />
15+
<Setter x:Uid="Setter_6" Property="TextOptions.TextFormattingMode" Value="Ideal" />
16+
</Style>
17+
18+
<Style x:Uid="Style_11" TargetType="{x:Type Label}" x:Key="{x:Static vsfx:VsResourceKeys.LabelEnvironment200PercentFontSizeStyleKey}">
19+
<Setter x:Uid="Setter_30" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment200PercentFontSizeKey}}" />
20+
<Setter x:Uid="Setter_31" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment200PercentFontWeightKey}}" />
21+
<Setter x:Uid="Setter_32" Property="TextOptions.TextFormattingMode" Value="Ideal" />
22+
</Style>
23+
24+
<Style x:Uid="Style_4" TargetType="{x:Type Label}" x:Key="{x:Static vsfx:VsResourceKeys.LabelEnvironment155PercentFontSizeStyleKey}">
25+
<Setter x:Uid="Setter_10" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment155PercentFontSizeKey}}" />
26+
<Setter x:Uid="Setter_11" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment155PercentFontWeightKey}}" />
27+
<Setter x:Uid="Setter_12" Property="TextOptions.TextFormattingMode" Value="Ideal" />
28+
</Style>
29+
30+
<Style x:Uid="Style_5" TargetType="{x:Type Label}" x:Key="{x:Static vsfx:VsResourceKeys.LabelEnvironment133PercentFontSizeStyleKey}">
31+
<Setter x:Uid="Setter_13" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment133PercentFontSizeKey}}" />
32+
<Setter x:Uid="Setter_14" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment133PercentFontWeightKey}}" />
33+
<Setter x:Uid="Setter_15" Property="TextOptions.TextFormattingMode" Value="Ideal" />
34+
</Style>
35+
36+
<Style x:Uid="Style_6" TargetType="{x:Type Label}" x:Key="{x:Static vsfx:VsResourceKeys.LabelEnvironment122PercentFontSizeStyleKey}">
37+
<Setter x:Uid="Setter_16" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment122PercentFontSizeKey}}" />
38+
<Setter x:Uid="Setter_17" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment122PercentFontWeightKey}}" />
39+
<Setter x:Uid="Setter_18" Property="TextOptions.TextFormattingMode" Value="Ideal" />
40+
</Style>
41+
42+
<Style x:Uid="Style_8" TargetType="{x:Type Label}" x:Key="{x:Static vsfx:VsResourceKeys.LabelEnvironmentBoldStyleKey}">
43+
<Setter x:Uid="Setter_22" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.EnvironmentFontSizeKey}}" />
44+
<Setter x:Uid="Setter_23" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.EnvironmentBoldFontWeightKey}}" />
45+
</Style>
46+
47+
</ResourceDictionary>

‎src/GitHub.VisualStudio.UI/Themes/FontScalingTextBlockStyle.xaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<ResourceDictionary
2+
x:Uid="ResourceDictionary_1" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0">
5+
6+
<Style x:Uid="Style_1" TargetType="{x:Type TextBlock}" x:Key="{x:Static vsfx:VsResourceKeys.TextBlockEnvironment375PercentFontSizeStyleKey}">
7+
<Setter x:Uid="Setter_1" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment375PercentFontSizeKey}}" />
8+
<Setter x:Uid="Setter_2" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment375PercentFontWeightKey}}" />
9+
<Setter x:Uid="Setter_3" Property="TextOptions.TextFormattingMode" Value="Ideal" />
10+
</Style>
11+
12+
<Style x:Uid="Style_2" TargetType="{x:Type TextBlock}" x:Key="{x:Static vsfx:VsResourceKeys.TextBlockEnvironment310PercentFontSizeStyleKey}">
13+
<Setter x:Uid="Setter_4" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment310PercentFontSizeKey}}" />
14+
<Setter x:Uid="Setter_5" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment310PercentFontWeightKey}}" />
15+
<Setter x:Uid="Setter_6" Property="TextOptions.TextFormattingMode" Value="Ideal" />
16+
</Style>
17+
18+
<Style x:Uid="Style_11" TargetType="{x:Type TextBlock}" x:Key="{x:Static vsfx:VsResourceKeys.TextBlockEnvironment200PercentFontSizeStyleKey}">
19+
<Setter x:Uid="Setter_30" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment200PercentFontSizeKey}}" />
20+
<Setter x:Uid="Setter_31" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment200PercentFontWeightKey}}" />
21+
<Setter x:Uid="Setter_32" Property="TextOptions.TextFormattingMode" Value="Ideal" />
22+
</Style>
23+
24+
<Style x:Uid="Style_4" TargetType="{x:Type TextBlock}" x:Key="{x:Static vsfx:VsResourceKeys.TextBlockEnvironment155PercentFontSizeStyleKey}">
25+
<Setter x:Uid="Setter_10" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment155PercentFontSizeKey}}" />
26+
<Setter x:Uid="Setter_11" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment155PercentFontWeightKey}}" />
27+
<Setter x:Uid="Setter_12" Property="TextOptions.TextFormattingMode" Value="Ideal" />
28+
</Style>
29+
30+
<Style x:Uid="Style_5" TargetType="{x:Type TextBlock}" x:Key="{x:Static vsfx:VsResourceKeys.TextBlockEnvironment133PercentFontSizeStyleKey}">
31+
<Setter x:Uid="Setter_13" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment133PercentFontSizeKey}}" />
32+
<Setter x:Uid="Setter_14" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment133PercentFontWeightKey}}" />
33+
<Setter x:Uid="Setter_15" Property="TextOptions.TextFormattingMode" Value="Ideal" />
34+
</Style>
35+
36+
<Style x:Uid="Style_6" TargetType="{x:Type TextBlock}" x:Key="{x:Static vsfx:VsResourceKeys.TextBlockEnvironment122PercentFontSizeStyleKey}">
37+
<Setter x:Uid="Setter_16" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment122PercentFontSizeKey}}" />
38+
<Setter x:Uid="Setter_17" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.Environment122PercentFontWeightKey}}" />
39+
<Setter x:Uid="Setter_18" Property="TextOptions.TextFormattingMode" Value="Ideal" />
40+
</Style>
41+
42+
<Style x:Uid="Style_8" TargetType="{x:Type TextBlock}" x:Key="{x:Static vsfx:VsResourceKeys.TextBlockEnvironmentBoldStyleKey}">
43+
<Setter x:Uid="Setter_22" Property="FontSize" Value="{DynamicResource {x:Static vsfx:VsFonts.EnvironmentFontSizeKey}}" />
44+
<Setter x:Uid="Setter_23" Property="FontWeight" Value="{DynamicResource {x:Static vsfx:VsFonts.EnvironmentBoldFontWeightKey}}" />
45+
</Style>
46+
47+
</ResourceDictionary>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:shell="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
34
xmlns:ghfvs="https://github.com/github/VisualStudio">
45

56
<ResourceDictionary.MergedDictionaries>
67
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
78
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
89
<StaticResource ResourceKey="ThemedDialogDefaultStylesKey"/>
910
</ResourceDictionary.MergedDictionaries>
10-
<Style TargetType="{x:Type TextBlock}" x:Key="GitHubH1TextBlock" BasedOn="{StaticResource TextBlockEnvironment200PercentFontSizeStyleKey}" />
11-
<Style TargetType="{x:Type TextBlock}" x:Key="GitHubDescriptionTextBlock" BasedOn="{StaticResource TextBlockEnvironment111PercentFontSizeStyleKey}" />
11+
<Style TargetType="{x:Type TextBlock}" x:Key="GitHubH1TextBlock" BasedOn="{StaticResource {x:Static shell:VsResourceKeys.TextBlockEnvironment200PercentFontSizeStyleKey}}" />
12+
<Style TargetType="{x:Type TextBlock}" x:Key="GitHubDescriptionTextBlock" BasedOn="{StaticResource {x:Static shell:VsResourceKeys.TextBlockEnvironment122PercentFontSizeStyleKey}}" />
1213
</ResourceDictionary>

0 commit comments

Comments
 (0)