feat(ui): add Merge button to DiffModal
This commit is contained in:
@@ -63,12 +63,15 @@
|
|||||||
FontFamily="{StaticResource MonoFamily}"
|
FontFamily="{StaticResource MonoFamily}"
|
||||||
FontSize="12"
|
FontSize="12"
|
||||||
Foreground="{StaticResource TextDimBrush}"/>
|
Foreground="{StaticResource TextDimBrush}"/>
|
||||||
<Button Grid.Column="1"
|
<StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">
|
||||||
Classes="icon-btn"
|
<Button Content="Merge…"
|
||||||
|
Command="{Binding MergeCommand}"
|
||||||
|
Margin="0,0,4,0" />
|
||||||
|
<Button Classes="icon-btn"
|
||||||
Content="✕"
|
Content="✕"
|
||||||
FontSize="12"
|
FontSize="12"
|
||||||
Command="{Binding CloseCommand}"
|
Command="{Binding CloseCommand}" />
|
||||||
VerticalAlignment="Center"/>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user