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

Commit 1806beb

Browse files
committed
Use VS info icon and lighter background color
1 parent a489f5d commit 1806beb

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
xmlns:cache="clr-namespace:GitHub.UI.Helpers;assembly=GitHub.UI"
88
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
99
xmlns:ghfvs="https://github.com/github/VisualStudio"
10+
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
11+
xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
1012
mc:Ignorable="d"
1113
d:DesignHeight="200" d:DesignWidth="500">
1214
<UserControl.Resources>
@@ -63,25 +65,6 @@
6365
</DockPanel>
6466
</Border>
6567

66-
<Border DockPanel.Dock="Top"
67-
Background="{DynamicResource {x:Static SystemColors.InfoBrushKey}}"
68-
Padding="8">
69-
<Border.Style>
70-
<Style TargetType="Border">
71-
<Setter Property="Visibility" Value="Collapsed"/>
72-
<Style.Triggers>
73-
<DataTrigger Binding="{Binding Thread.IsResolved}" Value="True">
74-
<Setter Property="Visibility" Value="Visible"/>
75-
</DataTrigger>
76-
</Style.Triggers>
77-
</Style>
78-
</Border.Style>
79-
<DockPanel>
80-
<ui:OcticonImage DockPanel.Dock="Left" Icon="info" Margin="0 0 8 0"/>
81-
<TextBlock TextWrapping="Wrap" Text="{x:Static ghfvs:Resources.ThisConversationWasMarkedAsResolved}"/>
82-
</DockPanel>
83-
</Border>
84-
8568
<Border DockPanel.Dock="Top"
8669
BorderThickness="0 0 0 1"
8770
Background="{DynamicResource VsBrush.CommandBarOptionsBackground}"
@@ -120,6 +103,27 @@
120103
</StackPanel>
121104
</Border>
122105

106+
<Border DockPanel.Dock="Top"
107+
Background="{DynamicResource GitHubPeekViewBackground}"
108+
BorderBrush="{DynamicResource GitHubButtonBorderBrush}"
109+
BorderThickness="0 0 0 1"
110+
Padding="8">
111+
<Border.Style>
112+
<Style TargetType="Border">
113+
<Setter Property="Visibility" Value="Collapsed"/>
114+
<Style.Triggers>
115+
<DataTrigger Binding="{Binding Thread.IsResolved}" Value="True">
116+
<Setter Property="Visibility" Value="Visible"/>
117+
</DataTrigger>
118+
</Style.Triggers>
119+
</Style>
120+
</Border.Style>
121+
<DockPanel>
122+
<imaging:CrispImage Width="16" Height="16" Moniker="{x:Static catalog:KnownMonikers.StatusInformation}" Visibility="{Binding Model.AnnotationLevel, Converter={ghfvs:EqualsToVisibilityConverter Notice}}"/>
123+
<TextBlock TextWrapping="Wrap" Text="{x:Static ghfvs:Resources.ThisConversationWasMarkedAsResolved}"/>
124+
</DockPanel>
125+
</Border>
126+
123127
<ScrollViewer Name="threadScroller"
124128
VerticalScrollBarVisibility="Auto"
125129
Background="{DynamicResource GitHubPeekViewBackground}">

0 commit comments

Comments
 (0)