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

Commit 13c0131

Browse files
committed
Merge branch 'feature/pr-user-reviews' into feature/show-pr-user-review-comments-in-editor
2 parents 47ccd4c + f799990 commit 13c0131

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFilesView.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<TreeView.ItemContainerStyle>
4444
<Style TargetType="TreeViewItem">
4545
<Setter Property="IsExpanded" Value="True"/>
46+
<Setter Property="Foreground" Value="{DynamicResource GitHubVsWindowText}"/>
4647
</Style>
4748
</TreeView.ItemContainerStyle>
4849
<TreeView.Resources>

src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewSummaryView.xaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,10 @@
5555

5656
<Grid.RowDefinitions>
5757
<RowDefinition Height="Auto"/>
58-
<RowDefinition Height="Auto"/>
5958
</Grid.RowDefinitions>
6059

6160
<c:AccountAvatar Grid.Column="0" VerticalAlignment="Top" Margin="2" Account="{Binding User}"/>
62-
<ui:GitHubActionLink Grid.Column="1" FontWeight="Bold" Margin="2 1 2 0"
61+
<ui:GitHubActionLink Grid.Column="1" FontWeight="SemiBold" Margin="2 1 2 0"
6362
Command="{Binding Path=DataContext.ShowReview, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:PullRequestDetailView}}}"
6463
CommandParameter="{Binding}"
6564
Content="{Binding User.Login}"
@@ -76,14 +75,6 @@
7675
Content="{x:Static prop:Resources.ContinueYourReview}"
7776
Visibility="{Binding State, Converter={ui:EqualsToVisibilityConverter Pending}}"/>
7877
</Grid>
79-
80-
<TextBlock Grid.ColumnSpan="3" Grid.Row="1"
81-
Margin="1 0"
82-
Foreground="{DynamicResource GitHubVsGrayText}">
83-
<Run Text="{Binding StateDisplay, Mode=OneWay}"/>
84-
<Run>|</Run>
85-
<Run Text="{Binding FileCommentCount, Mode=OneWay, StringFormat={}{0} file comments}"/>
86-
</TextBlock>
8778
</Grid>
8879
</Border>
8980

0 commit comments

Comments
 (0)