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

Commit 7a0354d

Browse files
committed
Circle back to the first iteration
🎵 It's the circle of design 🎵
1 parent fab2e2d commit 7a0354d

File tree

1 file changed

+38
-31
lines changed

1 file changed

+38
-31
lines changed

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

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,40 +50,47 @@
5050
</Image.Source>
5151
</Image>
5252

53-
<StackPanel Orientation="Vertical" Visibility="{Binding Converter={ghfvs:NullToVisibilityConverter}}">
54-
<TextBlock DockPanel.Dock="Left"
55-
TextTrimming="CharacterEllipsis"
56-
Text="{Binding Title}" />
53+
<Grid Visibility="{Binding Converter={ghfvs:NullToVisibilityConverter}}">
54+
<Grid.ColumnDefinitions>
55+
<ColumnDefinition Width="Auto" />
56+
<ColumnDefinition Width="*" />
57+
</Grid.ColumnDefinitions>
58+
<views:ActorAvatarView
59+
Grid.Column="0"
60+
ViewModel="{Binding Author}"
61+
Margin="0,1,4,0"
62+
Width="32"
63+
Height="32"
64+
VerticalAlignment="Top"/>
5765

58-
<Grid>
59-
<Grid.ColumnDefinitions>
60-
<ColumnDefinition Width="1*" />
61-
<ColumnDefinition Width="Auto" />
62-
</Grid.ColumnDefinitions>
63-
<StackPanel Grid.Column="0" Orientation="Horizontal">
64-
<views:ActorAvatarView
65-
ViewModel="{Binding Author}"
66-
Margin="0,1,4,0"
67-
Width="16"
68-
Height="16"
69-
VerticalAlignment="Top"/>
66+
<StackPanel Grid.Column="1">
67+
<TextBlock DockPanel.Dock="Left"
68+
TextTrimming="CharacterEllipsis"
69+
Text="{Binding Title}" />
7070

71-
<TextBlock Opacity="0.5" Margin="0 0 4 0">
72-
<Run Text="{Binding Number, Mode=OneWay, StringFormat=#{0}}"/>
73-
</TextBlock>
71+
<Grid>
72+
<Grid.ColumnDefinitions>
73+
<ColumnDefinition Width="*" />
74+
<ColumnDefinition Width="Auto" />
75+
</Grid.ColumnDefinitions>
76+
<StackPanel Grid.Column="0" Orientation="Horizontal">
77+
<TextBlock Opacity="0.5" Margin="0 0 4 0">
78+
<Run Text="{Binding Number, Mode=OneWay, StringFormat=#{0}}"/>
79+
</TextBlock>
7480

75-
<TextBlock Opacity="0.5" TextTrimming="CharacterEllipsis">
76-
<Run Text="updated"/>
77-
<Run Text="{Binding UpdatedAt, Converter={ghfvs:DurationToStringConverter}, Mode=OneWay}"/>
78-
by
79-
<Run Text="{Binding Author.Login, Mode=OneWay}"/>
80-
</TextBlock>
81-
</StackPanel>
81+
<TextBlock Opacity="0.5" TextTrimming="CharacterEllipsis">
82+
<Run Text="updated"/>
83+
<Run Text="{Binding UpdatedAt, Converter={ghfvs:DurationToStringConverter}, Mode=OneWay}"/>
84+
by
85+
<Run Text="{Binding Author.Login, Mode=OneWay}"/>
86+
</TextBlock>
87+
</StackPanel>
8288

83-
<TextBlock Opacity="0.5" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="8 0 0 0" Visibility="{Binding CommentCount, Converter={ghfvs:CountToVisibilityConverter}}"> <ghfvs:OcticonImage Icon="comment" Width="12" Height="12" Margin="0 0 0 -2"/>
84-
<Run Text="{Binding CommentCount, Mode=OneWay}" BaselineAlignment="Bottom"/>
85-
</TextBlock>
86-
</Grid>
87-
</StackPanel>
89+
<TextBlock Opacity="0.5" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="8 0 0 0" Visibility="{Binding CommentCount, Converter={ghfvs:CountToVisibilityConverter}}"> <ghfvs:OcticonImage Icon="comment" Width="12" Height="12" Margin="0 0 0 -2"/>
90+
<Run Text="{Binding CommentCount, Mode=OneWay}" BaselineAlignment="Bottom"/>
91+
</TextBlock>
92+
</Grid>
93+
</StackPanel>
94+
</Grid>
8895
</Grid>
8996
</UserControl>

0 commit comments

Comments
 (0)