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

Hide resolved comments in changes tree; Indicate resolved comments on margin #2253

Merged
merged 16 commits into from
Mar 26, 2019
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Prefer InfoBrushes
  • Loading branch information
donokuda committed Mar 5, 2019
commit e068eb44e1f885e58efa0c0beffd2dcce8d7eb8e
11 changes: 5 additions & 6 deletions src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,9 @@
</Border>

<Border DockPanel.Dock="Top"
Background="{DynamicResource GitHubPeekViewBackground}"
BorderBrush="{DynamicResource GitHubButtonBorderBrush}"
BorderThickness="0 0 0 1"
Padding="8">
Background="{DynamicResource VsBrush.InfoBackground}"
BorderThickness="1 0 0 1"
Padding="4">
<Border.Style>
<Style TargetType="Border">
<Setter Property="Visibility" Value="Collapsed"/>
Expand All @@ -119,8 +118,8 @@
</Style>
</Border.Style>
<DockPanel>
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusInformation}" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
<TextBlock TextWrapping="Wrap" Text="{x:Static ghfvs:Resources.ThisConversationWasMarkedAsResolved}"/>
<imaging:CrispImage Margin="4 0" Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusInformation}" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
<TextBlock Foreground="{DynamicResource VsBrush.InfoText}" TextWrapping="Wrap" Text="{x:Static ghfvs:Resources.ThisConversationWasMarkedAsResolved}"/>
</DockPanel>
</Border>

Expand Down