Skip to content

Commit 3918ff2

Browse files
love-lingerlove-linger
committed
ux: use monospaced font for all commit SHA
Signed-off-by: leo <longshuang@msn.cn>
1 parent ce7bc04 commit 3918ff2

27 files changed

Lines changed: 205 additions & 36 deletions

‎src/Resources/Styles.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,7 @@
532532
<Setter Property="Foreground" Value="{DynamicResource Brush.Link}"/>
533533
</Style>
534534
<Style Selector="Run.commit_link">
535+
<Setter Property="FontFamily" Value="{DynamicResource Fonts.Monospace}"/>
535536
<Setter Property="Foreground" Value="DarkOrange"/>
536537
<Setter Property="TextDecorations" Value="Underline"/>
537538
</Style>

‎src/Views/Archive.axaml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,17 @@
3636
<DataTemplate DataType="m:Commit">
3737
<Grid ColumnDefinitions="Auto,Auto,*">
3838
<Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
39-
<TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
40-
<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
39+
<TextBlock Grid.Column="1"
40+
VerticalAlignment="Center"
41+
FontFamily="{DynamicResource Fonts.Monospace}"
42+
Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
43+
Foreground="DarkOrange"
44+
Margin="8,0,0,0"/>
45+
<TextBlock Grid.Column="2"
46+
VerticalAlignment="Center"
47+
Text="{Binding Subject}"
48+
Margin="4,0,0,0"
49+
TextTrimming="CharacterEllipsis"/>
4150
</Grid>
4251
</DataTemplate>
4352

‎src/Views/Blame.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
<TextBlock Grid.Column="0"
116116
FontWeight="Bold"
117117
Margin="0,0,6,0"
118+
FontFamily="{DynamicResource Fonts.Monospace}"
118119
Text="{Binding Revision.SHA, Converter={x:Static c:StringConverters.ToShortSHA}, Mode=OneWay}"/>
119120

120121
<TextBlock Grid.Column="1"

‎src/Views/CheckoutDetached.axaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,15 @@
3535
<DataTemplate DataType="m:Commit">
3636
<Grid ColumnDefinitions="Auto,Auto,*">
3737
<Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}" />
38-
<TextBlock Grid.Column="1" Foreground="DarkOrange" VerticalAlignment="Center" Margin="8,0" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" />
39-
<TextBlock Grid.Column="2" Text="{Binding Subject, Mode=OneWay}" TextTrimming="CharacterEllipsis"/>
38+
<TextBlock Grid.Column="1"
39+
FontFamily="{DynamicResource Fonts.Monospace}"
40+
Foreground="DarkOrange"
41+
VerticalAlignment="Center"
42+
Margin="8,0"
43+
Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" />
44+
<TextBlock Grid.Column="2"
45+
Text="{Binding Subject, Mode=OneWay}"
46+
TextTrimming="CharacterEllipsis"/>
4047
</Grid>
4148
</DataTemplate>
4249

‎src/Views/CherryPick.axaml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,16 @@
5252
<DataTemplate DataType="m:Commit">
5353
<Grid ColumnDefinitions="14,Auto,*">
5454
<Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
55-
<TextBlock Grid.Column="1" FontFamily="{DynamicResource Fonts.Monospace}" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="6,0,4,0"/>
56-
<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" TextTrimming="CharacterEllipsis"/>
55+
<TextBlock Grid.Column="1"
56+
FontFamily="{DynamicResource Fonts.Monospace}"
57+
VerticalAlignment="Center"
58+
Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
59+
Foreground="DarkOrange"
60+
Margin="6,0,4,0"/>
61+
<TextBlock Grid.Column="2"
62+
VerticalAlignment="Center"
63+
Text="{Binding Subject}"
64+
TextTrimming="CharacterEllipsis"/>
5765
</Grid>
5866
</DataTemplate>
5967
</ListBox.ItemTemplate>
@@ -73,8 +81,16 @@
7381
<ComboBox.ItemTemplate>
7482
<DataTemplate x:DataType="{x:Type m:Commit}">
7583
<Grid ColumnDefinitions="Auto,*">
76-
<TextBlock Grid.Column="0" FontFamily="{DynamicResource Fonts.Monospace}" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="6,0,4,0"/>
77-
<TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding Subject}" TextTrimming="CharacterEllipsis"/>
84+
<TextBlock Grid.Column="0"
85+
FontFamily="{DynamicResource Fonts.Monospace}"
86+
VerticalAlignment="Center"
87+
Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
88+
Foreground="DarkOrange"
89+
Margin="6,0,4,0"/>
90+
<TextBlock Grid.Column="1"
91+
VerticalAlignment="Center"
92+
Text="{Binding Subject}"
93+
TextTrimming="CharacterEllipsis"/>
7894
</Grid>
7995
</DataTemplate>
8096
</ComboBox.ItemTemplate>

‎src/Views/CommitBaseInfo.axaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<!-- SHA -->
6464
<TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.SHA}" />
6565
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="24">
66-
<TextBlock Text="{Binding SHA}" Margin="12,0,4,0" VerticalAlignment="Center"/>
66+
<TextBlock Text="{Binding SHA}" Margin="12,0,4,0" FontFamily="{DynamicResource Fonts.Monospace}" VerticalAlignment="Center"/>
6767

6868
<Button Classes="icon_button" Width="24" Cursor="Hand" Click="OnCopyCommitSHA" ToolTip.Tip="{DynamicResource Text.Copy}">
6969
<Grid>
@@ -114,6 +114,7 @@
114114
<ItemsControl.ItemTemplate>
115115
<DataTemplate>
116116
<TextBlock Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
117+
FontFamily="{DynamicResource Fonts.Monospace}"
117118
Foreground="DarkOrange"
118119
TextDecorations="Underline"
119120
Cursor="Hand"
@@ -161,6 +162,7 @@
161162
<ItemsControl.ItemTemplate>
162163
<DataTemplate>
163164
<TextBlock Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
165+
FontFamily="{DynamicResource Fonts.Monospace}"
164166
Foreground="DarkOrange"
165167
TextDecorations="Underline"
166168
Cursor="Hand"

‎src/Views/Compare.axaml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@
5656
</Border>
5757
<TextBlock Grid.Column="3"
5858
Text="{Binding BaseHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
59-
Foreground="DarkOrange" Margin="8,0,0,0"
59+
FontFamily="{DynamicResource Fonts.Monospace}"
60+
Foreground="DarkOrange"
61+
Margin="8,0,0,0"
6062
TextDecorations="Underline"
6163
Cursor="Hand"
6264
PointerPressed="OnPressedSHA"/>
@@ -96,7 +98,14 @@
9698
<TextBlock Text="{Binding ToName}" Margin="4,0" Foreground="#FFF2F2F2"/>
9799
</StackPanel>
98100
</Border>
99-
<TextBlock Grid.Column="3" Text="{Binding ToHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA"/>
101+
<TextBlock Grid.Column="3"
102+
Text="{Binding ToHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
103+
FontFamily="{DynamicResource Fonts.Monospace}"
104+
Foreground="DarkOrange"
105+
Margin="8,0,0,0"
106+
TextDecorations="Underline"
107+
Cursor="Hand"
108+
PointerPressed="OnPressedSHA"/>
100109
<v:DateTimePresenter Grid.Column="4"
101110
Margin="8,0,0,0"
102111
Timestamp="{Binding ToHead.CommitterTime}"

‎src/Views/Conflict.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
UseGraphColor="False"/>
3434
<TextBlock Margin="4,0,0,0"
3535
Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
36+
FontFamily="{DynamicResource Fonts.Monospace}"
3637
Foreground="DarkOrange"
3738
TextDecorations="Underline"
3839
Cursor="Hand"

‎src/Views/CreateBranch.axaml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,17 @@
4242
<DataTemplate DataType="m:Commit">
4343
<Grid ColumnDefinitions="Auto,Auto,*">
4444
<Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
45-
<TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
46-
<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
45+
<TextBlock Grid.Column="1"
46+
VerticalAlignment="Center"
47+
Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
48+
FontFamily="{DynamicResource Fonts.Monospace}"
49+
Foreground="DarkOrange"
50+
Margin="8,0,0,0"/>
51+
<TextBlock Grid.Column="2"
52+
VerticalAlignment="Center"
53+
Text="{Binding Subject}"
54+
Margin="4,0,0,0"
55+
TextTrimming="CharacterEllipsis"/>
4756
</Grid>
4857
</DataTemplate>
4958

‎src/Views/CreateTag.axaml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,17 @@
3737
<DataTemplate DataType="m:Commit">
3838
<Grid ColumnDefinitions="Auto,Auto,*">
3939
<Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
40-
<TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
41-
<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
40+
<TextBlock Grid.Column="1"
41+
VerticalAlignment="Center"
42+
Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
43+
FontFamily="{DynamicResource Fonts.Monospace}"
44+
Foreground="DarkOrange"
45+
Margin="8,0,0,0"/>
46+
<TextBlock Grid.Column="2"
47+
VerticalAlignment="Center"
48+
Text="{Binding Subject}"
49+
Margin="4,0,0,0"
50+
TextTrimming="CharacterEllipsis"/>
4251
</Grid>
4352
</DataTemplate>
4453
</ContentControl.DataTemplates>

0 commit comments

Comments
 (0)