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

Commit 3ca7340

Browse files
donokudadonokuda
committed
Tweak layout for commit list
1 parent 448ccac commit 3ca7340

File tree

1 file changed

+66
-65
lines changed

1 file changed

+66
-65
lines changed

‎src/GitHub.VisualStudio.UI/Views/Documents/CommitListView.xaml‎

Lines changed: 66 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -17,74 +17,75 @@
1717
</ResourceDictionary>
1818
</Control.Resources>
1919

20-
<StackPanel Orientation="Vertical">
21-
<StackPanel Orientation="Horizontal" Margin="0,8">
22-
<Canvas Width="28"
23-
Height="28"
24-
Margin="0 0 4 0">
25-
<Ellipse Height="28"
26-
Width="28"
27-
Fill="#e1e4e8" />
20+
<Grid Margin="0,8">
21+
<Grid.ColumnDefinitions>
22+
<ColumnDefinition Width="45" />
23+
<ColumnDefinition Width="*" />
24+
</Grid.ColumnDefinitions>
2825

29-
<ghfvs:OcticonImage DockPanel.Dock="Left"
30-
Foreground="{DynamicResource VsBrush.WindowText}"
31-
Margin="6 7 6 6"
32-
Width="16"
33-
Icon="repo_push"
34-
HorizontalAlignment="Center" />
35-
</Canvas>
26+
<StackPanel Orientation="Vertical" Grid.Column="1">
27+
<StackPanel Orientation="Horizontal">
28+
<Canvas Width="28"
29+
Height="28"
30+
HorizontalAlignment="Center"
31+
Grid.Column="0">
32+
<Ellipse Height="28"
33+
Width="28"
34+
Fill="#e1e4e8" />
3635

36+
<ghfvs:OcticonImage DockPanel.Dock="Left"
37+
Foreground="{DynamicResource VsBrush.WindowText}"
38+
Margin="6 7 6 6"
39+
Width="16"
40+
Icon="repo_push"
41+
HorizontalAlignment="Center" />
42+
</Canvas>
3743

38-
<v:ActorAvatarView
39-
VerticalAlignment="Center"
40-
Width="16"
41-
Height="16"
42-
ViewModel="{Binding Author}"/>
44+
<v:ActorAvatarView
45+
VerticalAlignment="Center"
46+
Width="16"
47+
Height="16"
48+
Margin="4 0"
49+
ViewModel="{Binding Author}"/>
4350

44-
<TextBlock Foreground="{DynamicResource VsBrush.WindowText}" Margin="4 0"
45-
VerticalAlignment="Center">
46-
<Run FontWeight="Bold" Text="{Binding Author.Login, Mode=OneWay}" />
47-
<Run Text="{Binding AuthorCaption, Mode=OneWay}" />
48-
</TextBlock>
49-
</StackPanel>
50-
51-
<ItemsControl ItemsSource="{Binding Commits}">
52-
<Control.Resources>
53-
<DataTemplate DataType="{x:Type ghfvs:CommitSummaryViewModel}">
54-
<Border Padding="24 0 8 0">
55-
<DockPanel>
56-
<ghfvs:OcticonImage DockPanel.Dock="Left"
57-
Foreground="{DynamicResource VsBrush.GrayText}"
58-
Margin="0,0,2,0"
59-
Icon="git_commit"/>
60-
<v:ActorAvatarView DockPanel.Dock="Left"
61-
Width="16"
62-
Height="16"
63-
Margin="2"
64-
ViewModel="{Binding Author}"/>
65-
<TextBlock DockPanel.Dock="Right"
66-
FontFamily="Consolas"
67-
Margin="0,0,0,2"
68-
VerticalAlignment="Center">
69-
<Hyperlink Command="{Binding DataContext.ShowCommit, ElementName=timeline}"
70-
CommandParameter="{Binding Oid}">
71-
<Run Text="{Binding AbbreviatedOid, Mode=OneWay}"/>
72-
</Hyperlink>
73-
</TextBlock>
74-
<TextBlock Margin="0,0,0,2"
75-
Foreground="{DynamicResource VsBrush.WindowText}"
76-
Text="{Binding Header}"
77-
VerticalAlignment="Center"/>
78-
</DockPanel>
79-
</Border>
80-
</DataTemplate>
81-
</Control.Resources>
82-
</ItemsControl>
51+
<TextBlock Foreground="{DynamicResource VsBrush.WindowText}" VerticalAlignment="Center">
52+
<Run FontWeight="Bold" Text="{Binding Author.Login, Mode=OneWay}" />
53+
<Run Text="{Binding AuthorCaption, Mode=OneWay}" />
54+
</TextBlock>
55+
</StackPanel>
8356

84-
<Border BorderThickness="0,1,0,0"
85-
BorderBrush="{DynamicResource GitHubHeaderSeparatorBrush}"
86-
DockPanel.Dock="Bottom"
87-
Margin="0,8,0,0"
88-
Padding="0,4,0,0" />
89-
</StackPanel>
57+
<ItemsControl ItemsSource="{Binding Commits}">
58+
<Control.Resources>
59+
<DataTemplate DataType="{x:Type ghfvs:CommitSummaryViewModel}">
60+
<Border Padding="30 0 8 0">
61+
<DockPanel>
62+
<ghfvs:OcticonImage DockPanel.Dock="Left"
63+
Foreground="{DynamicResource VsBrush.GrayText}"
64+
Margin="0,0,2,0"
65+
Icon="git_commit"/>
66+
<v:ActorAvatarView DockPanel.Dock="Left"
67+
Width="16"
68+
Height="16"
69+
Margin="2"
70+
ViewModel="{Binding Author}"/>
71+
<TextBlock DockPanel.Dock="Right"
72+
FontFamily="Consolas"
73+
Margin="0,0,0,2"
74+
VerticalAlignment="Center">
75+
<Hyperlink Command="{Binding DataContext.ShowCommit, ElementName=timeline}"
76+
CommandParameter="{Binding Oid}">
77+
<Run Text="{Binding AbbreviatedOid, Mode=OneWay}"/>
78+
</Hyperlink>
79+
</TextBlock>
80+
<TextBlock Margin="0,0,0,2"
81+
Foreground="{DynamicResource VsBrush.WindowText}"
82+
Text="{Binding Header}"
83+
VerticalAlignment="Center"/>
84+
</DockPanel>
85+
</Border>
86+
</DataTemplate>
87+
</Control.Resources>
88+
</ItemsControl>
89+
</StackPanel>
90+
</Grid>
9091
</UserControl>

0 commit comments

Comments
 (0)