michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-11-01 13:13:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

style(*): 调整了部分界面的显示效果

Browse source
This commit is contained in:
ZCShou 2020-07-31 09:03:21 +08:00
parent f45013a520
commit ce4dccc592
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SourceGit/Resources/Styles/ToggleButton.xaml
View file

@ -94,8 +94,8 @@
Width="12" Width="12"
Style="{DynamicResource Style.Icon}" Style="{DynamicResource Style.Icon}"
Fill="Transparent" Fill="Transparent"
Stroke="{DynamicResource Brush.FG2}" Stroke="{DynamicResource Brush.FG}"
StrokeThickness="1" StrokeThickness=".4"
Data="{DynamicResource Icon.Tree}"/> Data="{DynamicResource Icon.Tree}"/>
</Grid> </Grid>

20
SourceGit/UI/CommitViewer.xaml
View file

@ -35,7 +35,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- SHA --> <!-- SHA -->
<Label Grid.Row="0" Grid.Column="0" Content="SHA" HorizontalAlignment="Right" Opacity=".5"/> <Label Grid.Row="0" Grid.Column="0" Content="SHA" HorizontalAlignment="Right" Opacity=".6"/>
<TextBox Grid.Row="0" Grid.Column="1" <TextBox Grid.Row="0" Grid.Column="1"
x:Name="SHA" x:Name="SHA"
IsReadOnly="True" IsReadOnly="True"
@ -44,7 +44,7 @@
Margin="11,0,0,0"/> Margin="11,0,0,0"/>
<!-- Refs --> <!-- Refs -->
<Label x:Name="lblRefs" Grid.Row="0" Grid.Column="2" Content="REFS" HorizontalAlignment="Right" Opacity=".5"/> <Label x:Name="lblRefs" Grid.Row="0" Grid.Column="2" Content="REFS" HorizontalAlignment="Right" Opacity=".6"/>
<ItemsControl Grid.Row="0" Grid.Column="3" x:Name="refs" Margin="8,0,0,0"> <ItemsControl Grid.Row="0" Grid.Column="3" x:Name="refs" Margin="8,0,0,0">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
@ -93,7 +93,7 @@
</ItemsControl> </ItemsControl>
<!-- PARENTS --> <!-- PARENTS -->
<Label Grid.Row="1" Grid.Column="0" Content="PARENTS" HorizontalAlignment="Right" Opacity=".5"/> <Label Grid.Row="1" Grid.Column="0" Content="PARENTS" HorizontalAlignment="Right" Opacity=".6"/>
<ItemsControl Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" x:Name="parents" Margin="8,0,0,0"> <ItemsControl Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" x:Name="parents" Margin="8,0,0,0">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
@ -116,7 +116,7 @@
</ItemsControl> </ItemsControl>
<!-- AUTHOR --> <!-- AUTHOR -->
<Label Grid.Row="2" Grid.Column="0" Content="AUTHOR" HorizontalAlignment="Right" Opacity=".5"/> <Label Grid.Row="2" Grid.Column="0" Content="AUTHOR" HorizontalAlignment="Right" Opacity=".6"/>
<TextBox Grid.Row="2" Grid.Column="1" x:Name="author" <TextBox Grid.Row="2" Grid.Column="1" x:Name="author"
IsReadOnly="True" IsReadOnly="True"
Background="Transparent" Background="Transparent"
@ -125,7 +125,7 @@
Margin="11,0,0,0"/> Margin="11,0,0,0"/>
<!-- AUTHOR TIME --> <!-- AUTHOR TIME -->
<Label Grid.Row="2" Grid.Column="2" Content="AUTHOR TIME" HorizontalAlignment="Right" Opacity=".5"/> <Label Grid.Row="2" Grid.Column="2" Content="AUTHOR TIME" HorizontalAlignment="Right" Opacity=".6"/>
<TextBox Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3" x:Name="authorTime" <TextBox Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3" x:Name="authorTime"
IsReadOnly="True" IsReadOnly="True"
Background="Transparent" Background="Transparent"
@ -134,7 +134,7 @@
Margin="8,0,0,0"/> Margin="8,0,0,0"/>
<!-- COMMITTER --> <!-- COMMITTER -->
<Label Grid.Row="3" Grid.Column="0" Content="COMMITTER" HorizontalAlignment="Right" Opacity=".5"/> <Label Grid.Row="3" Grid.Column="0" Content="COMMITTER" HorizontalAlignment="Right" Opacity=".6"/>
<TextBox Grid.Row="3" Grid.Column="1" x:Name="committer" <TextBox Grid.Row="3" Grid.Column="1" x:Name="committer"
IsReadOnly="True" IsReadOnly="True"
Background="Transparent" Background="Transparent"
@ -143,7 +143,7 @@
Margin="11,0,0,0"/> Margin="11,0,0,0"/>
<!-- COMMIT TIME --> <!-- COMMIT TIME -->
<Label Grid.Row="3" Grid.Column="2" Content="COMMIT TIME" HorizontalAlignment="Right" Opacity=".5"/> <Label Grid.Row="3" Grid.Column="2" Content="COMMIT TIME" HorizontalAlignment="Right" Opacity=".6"/>
<TextBox Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" x:Name="committerTime" <TextBox Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" x:Name="committerTime"
IsReadOnly="True" IsReadOnly="True"
Background="Transparent" Background="Transparent"
@ -154,7 +154,7 @@
<Rectangle Grid.Row="4" Grid.ColumnSpan="4" Height="1" Margin="8,0" Fill="{StaticResource Brush.Border2}"/> <Rectangle Grid.Row="4" Grid.ColumnSpan="4" Height="1" Margin="8,0" Fill="{StaticResource Brush.Border2}"/>
<!-- SUBJECT --> <!-- SUBJECT -->
<Label Grid.Row="5" Grid.Column="0" Content="SUBJECT" HorizontalAlignment="Right" Opacity=".5"/> <Label Grid.Row="5" Grid.Column="0" Content="SUBJECT" HorizontalAlignment="Right" Opacity=".6"/>
<TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3"
x:Name="subject" x:Name="subject"
IsReadOnly="True" IsReadOnly="True"
@ -163,7 +163,7 @@
Margin="8,0,16,0"/> Margin="8,0,16,0"/>
<!-- MESSAGE --> <!-- MESSAGE -->
<Label Grid.Row="6" Grid.Column="0" Content="DESCRIPTION" HorizontalAlignment="Right" VerticalAlignment="Top" Opacity=".5"/> <Label Grid.Row="6" Grid.Column="0" Content="DESCRIPTION" HorizontalAlignment="Right" VerticalAlignment="Top" Opacity=".6"/>
<TextBox Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="3" <TextBox Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="3"
x:Name="message" x:Name="message"
IsReadOnly="True" IsReadOnly="True"
@ -176,7 +176,7 @@
<Rectangle Grid.Row="7" Grid.ColumnSpan="4" Height="1" Margin="8,0" Fill="{StaticResource Brush.Border2}"/> <Rectangle Grid.Row="7" Grid.ColumnSpan="4" Height="1" Margin="8,0" Fill="{StaticResource Brush.Border2}"/>
<!-- CHANGELIST --> <!-- CHANGELIST -->
<Label Grid.Row="8" Grid.Column="0" Content="CHANGED" HorizontalAlignment="Right" VerticalAlignment="Top" Opacity=".5"/> <Label Grid.Row="8" Grid.Column="0" Content="CHANGED" HorizontalAlignment="Right" VerticalAlignment="Top" Opacity=".6"/>
<DataGrid <DataGrid
Grid.Row="8" Grid.Row="8"
Grid.Column="1" Grid.Column="1"

4
SourceGit/UI/Stashes.xaml
View file

@ -31,7 +31,7 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Content="STASHES" Foreground="{StaticResource Brush.FG2}" FontWeight="Bold"/> <Label Content="STASHES" Foreground="{StaticResource Brush.FG}" Opacity=".4" FontWeight="Bold"/>
<ListView <ListView
Grid.Row="1" Grid.Row="1"
x:Name="stashList" x:Name="stashList"
@ -83,7 +83,7 @@
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Grid.Column="0" Content="CHANGES" Foreground="{StaticResource Brush.FG2}" FontWeight="Bold"/> <Label Grid.Column="0" Content="CHANGES" Foreground="{StaticResource Brush.FG}" Opacity=".4" FontWeight="Bold"/>
<Label Grid.Column="1" Content="Untracked files not included" Foreground="{StaticResource Brush.FG2}" FontSize="10"/> <Label Grid.Column="1" Content="Untracked files not included" Foreground="{StaticResource Brush.FG2}" FontSize="10"/>
</Grid> </Grid>

16
SourceGit/UI/WorkingCopy.xaml
View file

@ -54,16 +54,16 @@
<ToggleButton <ToggleButton
Grid.Column="0" Grid.Column="0"
x:Name="toggleUnstangedMode" x:Name="toggleUnstangedMode"
Margin="4,0,0,0" Margin="4,0,4,0"
ToolTip="SWITCH TO LIST/TREE VIEW" ToolTip="SWITCH TO LIST/TREE VIEW"
Style="{StaticResource Style.ToggleButton.ListOrTree}" Style="{StaticResource Style.ToggleButton.ListOrTree}"
IsChecked="{Binding Source={x:Static source:App.Preference}, Path=UIUseListInUnstaged, Mode=TwoWay}"/> IsChecked="{Binding Source={x:Static source:App.Preference}, Path=UIUseListInUnstaged, Mode=TwoWay}"/>
<Label Grid.Column="1" Content="UNSTAGED" FontWeight="Bold" Foreground="{StaticResource Brush.FG2}"/> <Label Grid.Column="1" Content="UNSTAGED" FontWeight="Bold" Foreground="{StaticResource Brush.FG}" Opacity=".4"/>
<Button Grid.Column="3" Click="Stage" Margin="4,0" ToolTip="STAGE" Background="Transparent"> <Button Grid.Column="3" Click="Stage" Margin="4,0" ToolTip="STAGE" Background="Transparent">
<Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.StageSelected}" Fill="{StaticResource Brush.FG2}"/> <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.StageSelected}" Opacity=".4"/>
</Button> </Button>
<Button Grid.Column="4" Click="StageAll" Margin="4,0" ToolTip="STAGE ALL" Background="Transparent"> <Button Grid.Column="4" Click="StageAll" Margin="4,0" ToolTip="STAGE ALL" Background="Transparent">
<Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.StageAll}" Fill="{StaticResource Brush.FG2}"/> <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.StageAll}" Opacity=".4"/>
</Button> </Button>
</Grid> </Grid>
@ -189,16 +189,16 @@
<ToggleButton <ToggleButton
Grid.Column="0" Grid.Column="0"
x:Name="toggleStagedMode" x:Name="toggleStagedMode"
Margin="4,0,0,0" Margin="4,0,4,0"
ToolTip="SWITCH TO LIST/TREE VIEW" ToolTip="SWITCH TO LIST/TREE VIEW"
Style="{StaticResource Style.ToggleButton.ListOrTree}" Style="{StaticResource Style.ToggleButton.ListOrTree}"
IsChecked="{Binding Source={x:Static source:App.Preference}, Path=UIUseListInStaged, Mode=TwoWay}"/> IsChecked="{Binding Source={x:Static source:App.Preference}, Path=UIUseListInStaged, Mode=TwoWay}"/>
<Label Grid.Column="1" Content="STAGED" FontWeight="Bold" Foreground="{StaticResource Brush.FG2}"/> <Label Grid.Column="1" Content="STAGED" FontWeight="Bold" Foreground="{StaticResource Brush.FG}" Opacity=".4"/>
<Button Grid.Column="3" Click="Unstage" ToolTip="UNSTAGE" Margin="4,0" Background="Transparent"> <Button Grid.Column="3" Click="Unstage" ToolTip="UNSTAGE" Margin="4,0" Background="Transparent">
<Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.UnstageSelected}" Fill="{StaticResource Brush.FG2}"/> <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.UnstageSelected}" Opacity=".4"/>
</Button> </Button>
<Button Grid.Column="4" Click="UnstageAll" ToolTip="UNSTAGE ALL" Margin="4,0" Background="Transparent"> <Button Grid.Column="4" Click="UnstageAll" ToolTip="UNSTAGE ALL" Margin="4,0" Background="Transparent">
<Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.UnstageAll}" Fill="{StaticResource Brush.FG2}"/> <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.UnstageAll}" Opacity=".4"/>
</Button> </Button>
</Grid> </Grid>