michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

<style>(<*>): 完善Tab的阴影效果，调整 Merge 提示框 和 错误提示框的按键大小

Browse source
This commit is contained in:
ZCShou 2020-08-12 08:06:43 +08:00
parent fa1a86b7ac
commit 1bdc4f91af
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/UI/Dashboard.xaml
View file

@ -503,7 +503,7 @@
<Label Grid.Column="0" x:Name="txtMergeProcessing" FontWeight="DemiBold" Foreground="{StaticResource Brush.BG4}"/> <Label Grid.Column="0" x:Name="txtMergeProcessing" FontWeight="DemiBold" Foreground="{StaticResource Brush.BG4}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal"> <StackPanel Grid.Column="1" Orientation="Horizontal">
<Button x:Name="btnResolve" Click="Resolve" Content="RESOLVE" Margin="4"> <Button x:Name="btnResolve" Click="Resolve" Content="RESOLVE" Margin="2">
<Button.Style> <Button.Style>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource Style.Button.Bordered}"> <Style TargetType="{x:Type Button}" BasedOn="{StaticResource Style.Button.Bordered}">
<Setter Property="Background" Value="{StaticResource Brush.BG1}"/> <Setter Property="Background" Value="{StaticResource Brush.BG1}"/>
@ -511,8 +511,8 @@
</Style> </Style>
</Button.Style> </Button.Style>
</Button> </Button>
<Button x:Name="btnContinue" Click="Continue" Content="CONTINUE" Style="{StaticResource Style.Button.AccentBordered}" Margin="4"/> <Button x:Name="btnContinue" Click="Continue" Content="CONTINUE" Style="{StaticResource Style.Button.AccentBordered}" Margin="2"/>
<Button Grid.Column="3" Click="Abort" Content="ABORT" Style="{StaticResource Style.Button.Bordered}" Foreground="{StaticResource Brush.BG1}" Margin="4"/> <Button Grid.Column="3" Click="Abort" Content="ABORT" Style="{StaticResource Style.Button.Bordered}" Foreground="{StaticResource Brush.BG1}" Margin="2"/>
</StackPanel> </StackPanel>
</Grid> </Grid>

3
src/UI/Launcher.xaml
View file

@ -80,7 +80,7 @@
<Grid x:Name="Container" Opacity=".7" SnapsToDevicePixels="True" WindowChrome.IsHitTestVisibleInChrome="True"> <Grid x:Name="Container" Opacity=".7" SnapsToDevicePixels="True" WindowChrome.IsHitTestVisibleInChrome="True">
<Border x:Name="BG" SnapsToDevicePixels="True" Background="Transparent" BorderThickness="0" BorderBrush="{StaticResource Brush.BG3}" CornerRadius="4,4,0,0"> <Border x:Name="BG" SnapsToDevicePixels="True" Background="Transparent" BorderThickness="0" BorderBrush="{StaticResource Brush.BG3}" CornerRadius="4,4,0,0">
<Border.Effect> <Border.Effect>
<DropShadowEffect ShadowDepth="2" Direction="30" Color="Black" Opacity=".3"/> <DropShadowEffect BlurRadius="8" ShadowDepth="0" Direction="270" Opacity=".5"/>
</Border.Effect> </Border.Effect>
</Border> </Border>
@ -277,6 +277,7 @@
Grid.Row="2" Grid.Row="2"
Margin="4,0" Margin="4,0"
Click="RemoveError" Click="RemoveError"
Height="25"
Content="CLOSE" Content="CLOSE"
Style="{StaticResource Style.Button.AccentBordered}" Style="{StaticResource Style.Button.AccentBordered}"
BorderBrush="{StaticResource Brush.FG}" BorderBrush="{StaticResource Brush.FG}"