|
8 | 8 | mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600" |
9 | 9 | x:Class="SourceGit.Views.WorkingCopy" |
10 | 10 | x:DataType="vm:WorkingCopy"> |
11 | | - <Grid SizeChanged="OnMainLayoutSizeChanged"> |
| 11 | + <Grid SizeChanged="OnMainLayoutSizeChanged" Background="{DynamicResource Brush.SubPanel}"> |
12 | 12 | <Grid.ColumnDefinitions> |
13 | 13 | <ColumnDefinition Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.WorkingCopyLeftWidth, Mode=TwoWay}" MinWidth="300"/> |
14 | 14 | <ColumnDefinition Width="4"/> |
15 | 15 | <ColumnDefinition Width="*" MinWidth="300"/> |
16 | 16 | </Grid.ColumnDefinitions> |
17 | 17 |
|
18 | 18 | <!-- Left --> |
19 | | - <Grid Grid.Column="0"> |
| 19 | + <Grid Grid.Column="0" Background="{DynamicResource Brush.Window}"> |
20 | 20 | <Grid.RowDefinitions> |
21 | 21 | <RowDefinition Height="36" MinHeight="36" MaxHeight="36"/> |
22 | 22 | <RowDefinition Height="*" MinHeight="100"/> |
|
206 | 206 | <GridSplitter Grid.Column="1" |
207 | 207 | MinWidth="1" |
208 | 208 | HorizontalAlignment="Stretch" VerticalAlignment="Stretch" |
209 | | - Background="{DynamicResource Brush.SubPanel}" |
| 209 | + Background="Transparent" |
210 | 210 | BorderThickness="1,0,0,0" |
211 | 211 | BorderBrush="{DynamicResource Brush.Border0}" |
212 | 212 | Focusable="False"/> |
213 | 213 |
|
214 | 214 | <!-- Right --> |
215 | | - <Grid Grid.Column="2" Background="{DynamicResource Brush.SubPanel}"> |
| 215 | + <Grid Grid.Column="2" Margin="4,4,6,0"> |
216 | 216 | <Grid.RowDefinitions> |
217 | 217 | <RowDefinition Height="*" MinHeight="100"/> |
218 | 218 | <RowDefinition Height="4"/> |
|
221 | 221 | </Grid.RowDefinitions> |
222 | 222 |
|
223 | 223 | <!-- 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> |
235 | 233 |
|
236 | 234 | <ContentControl Content="{Binding DetailContext}"> |
237 | 235 | <ContentControl.DataTemplates> |
|
254 | 252 |
|
255 | 253 | <!-- Commit Message --> |
256 | 254 | <v:CommitMessageToolBox Grid.Row="2" |
257 | | - Margin="0,0,4,0" |
258 | 255 | ShowAdvancedOptions="True" |
259 | 256 | CommitMessage="{Binding CommitMessage, Mode=TwoWay}"/> |
260 | 257 |
|
261 | 258 | <!-- 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"> |
263 | 260 | <CheckBox Grid.Column="0" |
264 | 261 | Height="24" |
265 | 262 | Margin="1,0,0,0" |
|
0 commit comments