Skip to content

Commit f40433b

Browse files
committed
ux: new style for ref compare dialog
Signed-off-by: leo <[email protected]>
1 parent 8835563 commit f40433b

File tree

4 files changed

+2
-14
lines changed

4 files changed

+2
-14
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@
183183
<x:String x:Key="Text.CommitMessageTextBox.Placeholder" xml:space="preserve">Enter commit message. Please use an empty-line to separate subject and description!</x:String>
184184
<x:String x:Key="Text.CommitMessageTextBox.SubjectCount" xml:space="preserve">SUBJECT</x:String>
185185
<x:String x:Key="Text.Compare" xml:space="preserve">Compare</x:String>
186-
<x:String x:Key="Text.Compare.Base" xml:space="preserve">Base:</x:String>
187186
<x:String x:Key="Text.Compare.WithHead" xml:space="preserve">Compare with HEAD</x:String>
188187
<x:String x:Key="Text.Configure" xml:space="preserve">Repository Configure</x:String>
189188
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">COMMIT TEMPLATE</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@
187187
<x:String x:Key="Text.CommitMessageTextBox.Placeholder" xml:space="preserve">请输入提交的信息。注意:主题与具体描述中间需要空白行分隔!</x:String>
188188
<x:String x:Key="Text.CommitMessageTextBox.SubjectCount" xml:space="preserve">主题</x:String>
189189
<x:String x:Key="Text.Compare" xml:space="preserve">比较</x:String>
190-
<x:String x:Key="Text.Compare.Base" xml:space="preserve">左侧 :</x:String>
191190
<x:String x:Key="Text.Compare.WithHead" xml:space="preserve">与当前 HEAD 对比</x:String>
192191
<x:String x:Key="Text.Configure" xml:space="preserve">仓库配置</x:String>
193192
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">提交信息模板</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@
187187
<x:String x:Key="Text.CommitMessageTextBox.Placeholder" xml:space="preserve">請輸入提交訊息,標題與詳細描述之間請使用單行空白區隔。</x:String>
188188
<x:String x:Key="Text.CommitMessageTextBox.SubjectCount" xml:space="preserve">標題</x:String>
189189
<x:String x:Key="Text.Compare" xml:space="preserve">比較</x:String>
190-
<x:String x:Key="Text.Compare.Base" xml:space="preserve">相較於 :</x:String>
191190
<x:String x:Key="Text.Compare.WithHead" xml:space="preserve">與目前 HEAD 比較</x:String>
192191
<x:String x:Key="Text.Configure" xml:space="preserve">存放庫設定</x:String>
193192
<x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">提交訊息範本</x:String>

src/Views/CompareCommandPalette.axaml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,9 @@
3030
Height="18"
3131
CornerRadius="4"
3232
Margin="4,0,0,0" Padding="4,0">
33-
<TextBlock Text="{DynamicResource Text.Compare}"
34-
Foreground="Black"
35-
FontWeight="Bold"/>
36-
</Border>
37-
38-
<Border BorderThickness="0"
39-
Background="Green"
40-
Height="18"
41-
CornerRadius="4"
42-
Margin="4,0,0,0" Padding="4,0">
4333
<StackPanel Orientation="Horizontal">
44-
<TextBlock Text="{DynamicResource Text.Compare.Base}" Foreground="White" FontWeight="Bold"/>
34+
<TextBlock Text="{DynamicResource Text.Compare}" Foreground="Black" FontWeight="Bold"/>
35+
4536
<ContentControl Content="{Binding BasedOn}" Margin="4,0,0,0" MaxWidth="100">
4637
<ContentControl.DataTemplates>
4738
<DataTemplate DataType="m:Branch">

0 commit comments

Comments
 (0)