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<Dashboard>: add Brush.SideBar to replace both Brush.GroupBar and Brush.Content

Browse source
This commit is contained in:
leo 2021-04-02 14:07:17 +08:00
parent d1842392bc
commit 6e6bbaaf0b
3 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Resources/Themes/Dark.xaml
View file

@ -10,8 +10,7 @@
<SolidColorBrush x:Key="Brush.Contents" Color="#FF1B1B1B"/> <SolidColorBrush x:Key="Brush.Contents" Color="#FF1B1B1B"/>
<SolidColorBrush x:Key="Brush.Badge" Color="#FF8F8F8F"/> <SolidColorBrush x:Key="Brush.Badge" Color="#FF8F8F8F"/>
<SolidColorBrush x:Key="Brush.CommitViewer" Color="#FF222222"/> <SolidColorBrush x:Key="Brush.CommitViewer" Color="#FF222222"/>
<SolidColorBrush x:Key="Brush.GroupBar" Color="#FF303030"/> <SolidColorBrush x:Key="Brush.SideBar" Color="#FF252525"/>
<SolidColorBrush x:Key="Brush.GroupContent" Color="#FF252525"/>
<SolidColorBrush x:Key="Brush.Decorator" Color="#FF505050"/> <SolidColorBrush x:Key="Brush.Decorator" Color="#FF505050"/>
<SolidColorBrush x:Key="Brush.Conflict" Color="#FFFAFAD2"/> <SolidColorBrush x:Key="Brush.Conflict" Color="#FFFAFAD2"/>

3
src/Resources/Themes/Light.xaml
View file

@ -10,8 +10,7 @@
<SolidColorBrush x:Key="Brush.Contents" Color="White"/> <SolidColorBrush x:Key="Brush.Contents" Color="White"/>
<SolidColorBrush x:Key="Brush.Badge" Color="#FFAFAFAF"/> <SolidColorBrush x:Key="Brush.Badge" Color="#FFAFAFAF"/>
<SolidColorBrush x:Key="Brush.CommitViewer" Color="#FFF0F0F0"/> <SolidColorBrush x:Key="Brush.CommitViewer" Color="#FFF0F0F0"/>
<SolidColorBrush x:Key="Brush.GroupBar" Color="#FFE8E8E8"/> <SolidColorBrush x:Key="Brush.SideBar" Color="#FFF8F8F8"/>
<SolidColorBrush x:Key="Brush.GroupContent" Color="#FFF8F8F8"/>
<SolidColorBrush x:Key="Brush.Decorator" Color="#FFBDBDBD"/> <SolidColorBrush x:Key="Brush.Decorator" Color="#FFBDBDBD"/>
<SolidColorBrush x:Key="Brush.Conflict" Color="#FF836C2E"/> <SolidColorBrush x:Key="Brush.Conflict" Color="#FF836C2E"/>

24
src/UI/Dashboard.xaml
View file

@ -119,7 +119,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- Left panel --> <!-- Left panel -->
<Grid Grid.Column="0" x:Name="main"> <Grid Grid.Column="0" x:Name="main" Background="{StaticResource Brush.SideBar}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="24"/> <RowDefinition Height="24"/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
@ -129,7 +129,6 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="24"/> <RowDefinition Height="24"/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="1"/>
<RowDefinition Height="24"/> <RowDefinition Height="24"/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
@ -139,14 +138,13 @@
</Grid.Resources> </Grid.Resources>
<!-- WORKSPACE --> <!-- WORKSPACE -->
<Border Grid.Row="0" Background="{StaticResource Brush.GroupBar}"> <Border Grid.Row="0">
<Label Margin="4,0,0,0" Content="{StaticResource Text.Dashboard.Workspace}" Style="{StaticResource Style.Label.GroupHeader}" /> <Label Margin="4,0,0,0" Content="{StaticResource Text.Dashboard.Workspace}" Style="{StaticResource Style.Label.GroupHeader}" />
</Border> </Border>
<ListView <ListView
Grid.Row="1" Grid.Row="1"
x:Name="workspace" x:Name="workspace"
Style="{StaticResource Style.ListView.Borderless}" Style="{StaticResource Style.ListView.Borderless}"
Background="{StaticResource Brush.GroupContent}"
SelectionMode="Single"> SelectionMode="Single">
<ListViewItem x:Name="historiesSwitch" Selected="SwitchHistories" IsSelected="True" Height="28"> <ListViewItem x:Name="historiesSwitch" Selected="SwitchHistories" IsSelected="True" Height="28">
<StackPanel Margin="16,0,0,0" Orientation="Horizontal"> <StackPanel Margin="16,0,0,0" Orientation="Horizontal">
@ -187,7 +185,7 @@
</ListView> </ListView>
<!-- LOCAL BRANCHES --> <!-- LOCAL BRANCHES -->
<Grid Grid.Row="2" Background="{StaticResource Brush.GroupBar}"> <Grid Grid.Row="2">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="16"/> <ColumnDefinition Width="16"/>
@ -208,7 +206,6 @@
x:Name="localBranchTree" x:Name="localBranchTree"
Padding="0" Padding="0"
FontFamily="Consolas" FontFamily="Consolas"
Background="{StaticResource Brush.GroupContent}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
LostFocus="TreeLostFocus" LostFocus="TreeLostFocus"
@ -272,7 +269,7 @@
</TreeView> </TreeView>
<!-- REMOTES --> <!-- REMOTES -->
<Grid Grid.Row="4" Background="{StaticResource Brush.GroupBar}"> <Grid Grid.Row="4">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="20"/> <ColumnDefinition Width="20"/>
@ -288,7 +285,6 @@
x:Name="remoteBranchTree" x:Name="remoteBranchTree"
Padding="0" Padding="0"
FontFamily="Consolas" FontFamily="Consolas"
Background="{StaticResource Brush.GroupContent}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
SelectedItemChanged="RemoteBranchSelected" SelectedItemChanged="RemoteBranchSelected"
@ -360,8 +356,7 @@
x:Name="tagListToggle" x:Name="tagListToggle"
Grid.Row="6" Grid.Row="6"
Style="{StaticResource Style.ToggleButton.Expender}" Style="{StaticResource Style.ToggleButton.Expender}"
IsChecked="{Binding Path=ExpandTags, ElementName=me, Mode=TwoWay}" IsChecked="{Binding Path=ExpandTags, ElementName=me, Mode=TwoWay}">
Background="{StaticResource Brush.GroupBar}">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
@ -380,7 +375,6 @@
Visibility="{Binding ElementName=tagListToggle, Path=IsChecked, Converter={StaticResource Bool2Collapsed}}" Visibility="{Binding ElementName=tagListToggle, Path=IsChecked, Converter={StaticResource Bool2Collapsed}}"
RowHeight="24" RowHeight="24"
Height="200" Height="200"
Background="{StaticResource Brush.GroupContent}"
LostFocus="TagLostFocus" LostFocus="TagLostFocus"
SelectionChanged="TagSelectionChanged" SelectionChanged="TagSelectionChanged"
ContextMenuOpening="TagContextMenuOpening" ContextMenuOpening="TagContextMenuOpening"
@ -423,15 +417,12 @@
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<Rectangle Grid.Row="8" Fill="{StaticResource Brush.GroupContent}" Height="1"/>
<!-- SUBMODULES --> <!-- SUBMODULES -->
<ToggleButton <ToggleButton
x:Name="submoduleListToggle" x:Name="submoduleListToggle"
Grid.Row="9" Grid.Row="8"
Style="{StaticResource Style.ToggleButton.Expender}" Style="{StaticResource Style.ToggleButton.Expender}"
IsChecked="False" IsChecked="False">
Background="{StaticResource Brush.GroupBar}">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
@ -455,7 +446,6 @@
Visibility="{Binding ElementName=submoduleListToggle, Path=IsChecked, Converter={StaticResource Bool2Collapsed}}" Visibility="{Binding ElementName=submoduleListToggle, Path=IsChecked, Converter={StaticResource Bool2Collapsed}}"
RowHeight="24" RowHeight="24"
Height="100" Height="100"
Background="{StaticResource Brush.GroupContent}"
LostFocus="SubmoduleLostFocus" LostFocus="SubmoduleLostFocus"
ContextMenuOpening="SubmoduleContextMenuOpening" ContextMenuOpening="SubmoduleContextMenuOpening"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"