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

Commit a46a2b7

Browse files
grokysgrokys
authored
Merge pull request #1543 from github/ui/dynamic-pr-review-colors
Fix a few theming issues
2 parents e2d42de + ff460ff commit a46a2b7

File tree

6 files changed

+23
-13
lines changed

6 files changed

+23
-13
lines changed

‎src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,6 @@
6464

6565
<SolidColorBrush x:Key="GitHubPeekViewBackground" Color="#F5F5F5" />
6666
<SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FFCCCEDB"/>
67+
68+
<Color x:Key="GitHubFileExpanderHeaderBackgroundColor">#ffd6dbe9</Color>
6769
</ResourceDictionary>

‎src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,6 @@
6464

6565
<SolidColorBrush x:Key="GitHubPeekViewBackground" Color="#252526" />
6666
<SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FF3F3F46"/>
67+
68+
<Color x:Key="GitHubFileExpanderHeaderBackgroundColor">#ff2d2d30</Color>
6769
</ResourceDictionary>

‎src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,6 @@
6464

6565
<SolidColorBrush x:Key="GitHubPeekViewBackground" Color="#F5F5F5" />
6666
<SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FFCCCEDB"/>
67+
68+
<Color x:Key="GitHubFileExpanderHeaderBackgroundColor">#ffeeeef2</Color>
6769
</ResourceDictionary>

‎src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFileCommentsView.xaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
BorderThickness="0"
4040
ScrollViewer.HorizontalScrollBarVisibility="Disabled">
4141
<ListBox.Resources>
42-
<SolidColorBrush x:Key="GitHubExpanderHeaderBackground" Color="#F5F5F5"/>
42+
<SolidColorBrush x:Key="GitHubExpanderHeaderBackground" Color="{DynamicResource GitHubFileExpanderHeaderBackgroundColor}"/>
4343
</ListBox.Resources>
4444
<ListBox.GroupStyle>
4545
<GroupStyle>
@@ -52,11 +52,12 @@
5252
Padding="0 4 4 4">
5353
<Expander.Header>
5454
<DockPanel>
55-
<ui:OcticonImage DockPanel.Dock="Left" Icon="file_text" Margin="2 0"/>
56-
<TextBlock DockPanel.Dock="Right" Text="{Binding Items.Count, Mode=OneWay}"/>
57-
<ui:OcticonImage DockPanel.Dock="Right" Icon="comment" Margin="2 0 2 -2"/>
55+
<ui:OcticonImage DockPanel.Dock="Left" Icon="file_text" Foreground="{DynamicResource VsBrush.WindowText}" Margin="2 0"/>
56+
<TextBlock DockPanel.Dock="Right" Text="{Binding Items.Count, Mode=OneWay}" Foreground="{DynamicResource VsBrush.WindowText}"/>
57+
<ui:OcticonImage DockPanel.Dock="Right" Icon="comment" Margin="2 0 2 -2" Foreground="{DynamicResource VsBrush.WindowText}"/>
5858
<ui:TrimmedPathTextBlock Grid.Column="1"
5959
FontWeight="SemiBold"
60+
Foreground="{DynamicResource VsBrush.WindowText}"
6061
Text="{Binding Name}"
6162
ToolTip="{Binding Name}"/>
6263
</DockPanel>

‎src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewAuthoringView.xaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,18 @@
3030

3131
<ScrollViewer>
3232
<StackPanel Margin="8,0">
33-
<TextBlock FontSize="16" Margin="0 4">
33+
<TextBlock FontSize="16" Margin="0 4 0 0">
3434
<Run>Submit your review for</Run>
3535
<Hyperlink Command="{Binding NavigateToPullRequest}">
3636
<Run>#</Run><Run Text="{Binding PullRequestModel.Number, Mode=OneWay}"/>
3737
</Hyperlink>
3838
</TextBlock>
3939
<TextBlock Foreground="{DynamicResource GitHubVsGrayText}" Text="{Binding PullRequestModel.Title}" TextWrapping="Wrap"/>
40-
<TextBlock Margin="0 4">Review summary</TextBlock>
40+
<TextBlock Margin="0 12 0 4">Your review summary</TextBlock>
4141
<TextBox AcceptsReturn="True"
42+
Background="{DynamicResource VsBrush.BrandedUIBackground}"
43+
Foreground="{DynamicResource VsBrush.BrandedUIText}"
44+
BorderBrush="{DynamicResource VsBrush.ActiveBorder}"
4245
Margin="0 4"
4346
MinHeight="120"
4447
Padding="0 4"
@@ -92,7 +95,7 @@
9295
<local:PullRequestFilesView DataContext="{Binding Files}"/>
9396
</TabItem>
9497
<TabItem Header="{Binding FileComments.Count}"
95-
HeaderStringFormat="File comments ({0})"
98+
HeaderStringFormat="Your file comments ({0})"
9699
Style="{DynamicResource GitHubPRDetailsTabItem}">
97100
<local:PullRequestFileCommentsView DataContext="{Binding FileComments}"/>
98101
</TabItem>

‎src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
TextWrapping="Wrap"/>
4646
<StackPanel Orientation="Horizontal" Margin="0 4">
4747
<c:AccountAvatar Account="{Binding User}" Margin="0 0 4 0" Width="16" Height="16"/>
48-
<TextBlock Text="{Binding Reviews.Count, StringFormat={}{0} reviews}"
48+
<TextBlock Foreground="{DynamicResource VsBrush.WindowText}" Text="{Binding Reviews.Count, StringFormat={}{0} reviews}"
4949
VerticalAlignment="Center"/>
5050
</StackPanel>
5151
</StackPanel>
@@ -75,28 +75,28 @@
7575
</TextBlock>
7676
</StackPanel>
7777
</Expander.Header>
78-
<StackPanel Margin="16 4 0 4">
78+
<StackPanel Margin="21 4 0 4">
7979
<Expander IsExpanded="True"
8080
Margin="0 4"
8181
Visibility="{Binding Body, Converter={ui:NullToVisibilityConverter}}">
8282
<Expander.Header>
83-
<TextBlock FontWeight="SemiBold">Description</TextBlock>
83+
<TextBlock Foreground="{DynamicResource VsBrush.WindowText}" FontWeight="SemiBold">Description</TextBlock>
8484
</Expander.Header>
85-
<markdig:MarkdownViewer Margin="22 4 0 0" Markdown="{Binding Body}"/>
85+
<markdig:MarkdownViewer Margin="22 4 0 0" Foreground="{DynamicResource VsBrush.WindowText}" Markdown="{Binding Body}"/>
8686
</Expander>
8787
<Expander IsExpanded="True"
8888
Margin="0 4"
8989
Visibility="{Binding FileComments.Count, Converter={ui:CountToVisibilityConverter}}">
9090
<Expander.Header>
91-
<TextBlock FontWeight="SemiBold">Comments</TextBlock>
91+
<TextBlock Foreground="{DynamicResource VsBrush.WindowText}" FontWeight="SemiBold">Comments</TextBlock>
9292
</Expander.Header>
9393
<local:PullRequestFileCommentsView DataContext="{Binding FileComments}"
9494
Margin="22 4 0 0"/>
9595
</Expander>
9696
<Expander Margin="0 4"
9797
Visibility="{Binding OutdatedFileComments.Count, Converter={ui:CountToVisibilityConverter}}">
9898
<Expander.Header>
99-
<TextBlock FontWeight="SemiBold">Outdated comments</TextBlock>
99+
<TextBlock Foreground="{DynamicResource VsBrush.WindowText}" FontWeight="SemiBold">Outdated comments</TextBlock>
100100
</Expander.Header>
101101
<local:PullRequestFileCommentsView DataContext="{Binding OutdatedFileComments}"
102102
Margin="22 4 0 0"/>

0 commit comments

Comments
 (0)