Skip to content

Commit 979b4a0

Browse files
committed
ux: theme for Local Changes and Stashes page
Signed-off-by: leo <longshuang@msn.cn>
1 parent 073a3ca commit 979b4a0

2 files changed

Lines changed: 27 additions & 32 deletions

File tree

src/Views/StashesPage.axaml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
1010
x:Class="SourceGit.Views.StashesPage"
1111
x:DataType="vm:StashesPage">
12-
<Grid SizeChanged="OnMainLayoutSizeChanged">
12+
<Grid SizeChanged="OnMainLayoutSizeChanged" Background="{DynamicResource Brush.SubPanel}">
1313
<Grid.ColumnDefinitions>
1414
<ColumnDefinition Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.StashesLeftWidth, Mode=TwoWay}" MinWidth="300"/>
1515
<ColumnDefinition Width="4"/>
1616
<ColumnDefinition Width="*" MinWidth="300"/>
1717
</Grid.ColumnDefinitions>
1818

1919
<!-- Left -->
20-
<Grid Grid.Column="0" RowDefinitions="28,36,*,28,*">
20+
<Grid Grid.Column="0" RowDefinitions="28,36,*,28,*" Background="{DynamicResource Brush.Window}">
2121
<!-- Stash Bar -->
2222
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto">
2323
<Path Grid.Column="0" Margin="8,0,0,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Stashes}"/>
@@ -148,25 +148,23 @@
148148
<GridSplitter Grid.Column="1"
149149
MinWidth=".5"
150150
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
151-
Background="{DynamicResource Brush.SubPanel}"
151+
Background="Transparent"
152152
BorderThickness="1,0,0,0"
153153
BorderBrush="{DynamicResource Brush.Border0}"
154154
Focusable="False"/>
155155

156156
<!-- Right -->
157-
<Grid Grid.Column="2" Background="{DynamicResource Brush.SubPanel}">
158-
<Border Margin="0,4,4,4" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
159-
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
160-
<Path Width="64" Height="64" Data="{StaticResource Icons.Diff}" Fill="{DynamicResource Brush.FG2}"/>
161-
<TextBlock Margin="0,16,0,0"
162-
Text="{DynamicResource Text.Diff.Welcome}"
163-
FontSize="18" FontWeight="Bold"
164-
Foreground="{DynamicResource Brush.FG2}"
165-
HorizontalAlignment="Center"/>
166-
</StackPanel>
167-
</Border>
157+
<Grid Grid.Column="2" Margin="4,4,6,4">
158+
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
159+
<Path Width="64" Height="64" Data="{StaticResource Icons.Diff}" Fill="{DynamicResource Brush.FG2}"/>
160+
<TextBlock Margin="0,16,0,0"
161+
Text="{DynamicResource Text.Diff.Welcome}"
162+
FontSize="18" FontWeight="Bold"
163+
Foreground="{DynamicResource Brush.FG2}"
164+
HorizontalAlignment="Center"/>
165+
</StackPanel>
168166

169-
<ContentControl Margin="0,4,4,4" Content="{Binding DiffContext}">
167+
<ContentControl Content="{Binding DiffContext}">
170168
<ContentControl.DataTemplates>
171169
<DataTemplate DataType="vm:DiffContext">
172170
<v:DiffView/>

src/Views/WorkingCopy.axaml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
99
x:Class="SourceGit.Views.WorkingCopy"
1010
x:DataType="vm:WorkingCopy">
11-
<Grid SizeChanged="OnMainLayoutSizeChanged">
11+
<Grid SizeChanged="OnMainLayoutSizeChanged" Background="{DynamicResource Brush.SubPanel}">
1212
<Grid.ColumnDefinitions>
1313
<ColumnDefinition Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.WorkingCopyLeftWidth, Mode=TwoWay}" MinWidth="300"/>
1414
<ColumnDefinition Width="4"/>
1515
<ColumnDefinition Width="*" MinWidth="300"/>
1616
</Grid.ColumnDefinitions>
1717

1818
<!-- Left -->
19-
<Grid Grid.Column="0">
19+
<Grid Grid.Column="0" Background="{DynamicResource Brush.Window}">
2020
<Grid.RowDefinitions>
2121
<RowDefinition Height="36" MinHeight="36" MaxHeight="36"/>
2222
<RowDefinition Height="*" MinHeight="100"/>
@@ -206,13 +206,13 @@
206206
<GridSplitter Grid.Column="1"
207207
MinWidth="1"
208208
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
209-
Background="{DynamicResource Brush.SubPanel}"
209+
Background="Transparent"
210210
BorderThickness="1,0,0,0"
211211
BorderBrush="{DynamicResource Brush.Border0}"
212212
Focusable="False"/>
213213

214214
<!-- Right -->
215-
<Grid Grid.Column="2" Background="{DynamicResource Brush.SubPanel}">
215+
<Grid Grid.Column="2" Margin="4,4,6,0">
216216
<Grid.RowDefinitions>
217217
<RowDefinition Height="*" MinHeight="100"/>
218218
<RowDefinition Height="4"/>
@@ -221,17 +221,15 @@
221221
</Grid.RowDefinitions>
222222

223223
<!-- Select Change Detail -->
224-
<Grid Grid.Row="0" Margin="0,4,4,0">
225-
<Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
226-
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
227-
<Path Width="64" Height="64" Data="{StaticResource Icons.Diff}" Fill="{DynamicResource Brush.FG2}"/>
228-
<TextBlock Margin="0,16,0,0"
229-
Text="{DynamicResource Text.Diff.Welcome}"
230-
FontSize="18" FontWeight="Bold"
231-
Foreground="{DynamicResource Brush.FG2}"
232-
HorizontalAlignment="Center"/>
233-
</StackPanel>
234-
</Border>
224+
<Grid Grid.Row="0">
225+
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
226+
<Path Width="64" Height="64" Data="{StaticResource Icons.Diff}" Fill="{DynamicResource Brush.FG2}"/>
227+
<TextBlock Margin="0,16,0,0"
228+
Text="{DynamicResource Text.Diff.Welcome}"
229+
FontSize="18" FontWeight="Bold"
230+
Foreground="{DynamicResource Brush.FG2}"
231+
HorizontalAlignment="Center"/>
232+
</StackPanel>
235233

236234
<ContentControl Content="{Binding DetailContext}">
237235
<ContentControl.DataTemplates>
@@ -254,12 +252,11 @@
254252

255253
<!-- Commit Message -->
256254
<v:CommitMessageToolBox Grid.Row="2"
257-
Margin="0,0,4,0"
258255
ShowAdvancedOptions="True"
259256
CommitMessage="{Binding CommitMessage, Mode=TwoWay}"/>
260257

261258
<!-- Commit Options -->
262-
<Grid Grid.Row="3" Margin="0,6,4,4" ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">
259+
<Grid Grid.Row="3" VerticalAlignment="Center" ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">
263260
<CheckBox Grid.Column="0"
264261
Height="24"
265262
Margin="1,0,0,0"

0 commit comments

Comments
 (0)