ux: commit base info layout

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Views/CommitBaseInfo.axaml

@@ -17,7 +17,7 @@
           <!-- Author -->
           <Grid ColumnDefinitions="96,*">
             <v:Avatar Grid.Column="0" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Author}"/>
-            <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
+            <StackPanel Grid.Column="1" Margin="16,0,4,0" Orientation="Vertical">
               <TextBlock Classes="group_header_label" Text="{DynamicResource Text.CommitDetail.Info.Author}"/>
               <Border Margin="0,10,0,8" Background="Transparent" ToolTip.Tip="{Binding Author}" Tag="{Binding Author}" ContextRequested="OnUserContextRequested">
                 <TextBlock Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis">
@@ -35,7 +35,7 @@
           <!-- Committer -->
           <Grid ColumnDefinitions="96,*" IsVisible="{Binding IsCommitterVisible}">
             <v:Avatar Grid.Column="0" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Committer}"/>
-            <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
+            <StackPanel Grid.Column="1" Margin="16,0,4,0" Orientation="Vertical">
               <TextBlock Classes="group_header_label" Text="{DynamicResource Text.CommitDetail.Info.Committer}"/>
               <Border Margin="0,10,0,8" Background="Transparent" ToolTip.Tip="{Binding Committer}" Tag="{Binding Committer}" ContextRequested="OnUserContextRequested">
                 <TextBlock Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis">
@@ -52,7 +52,7 @@
         </UniformGrid>
 
         <!-- Line -->
-        <Rectangle Height=".65" Margin="8" Fill="{DynamicResource Brush.Border2}" VerticalAlignment="Center"/>
+        <Rectangle Height=".65" Margin="8,8,0,8" Fill="{DynamicResource Brush.Border2}" VerticalAlignment="Center"/>
 
         <!-- Base Information -->
         <Grid RowDefinitions="24,Auto,Auto,Auto,Auto" ColumnDefinitions="96,*">
@@ -196,7 +196,7 @@
           <!-- Messages -->
           <TextBlock Grid.Row="4" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Message}" />
           <v:CommitMessagePresenter Grid.Row="4" Grid.Column="1"
-                                    Margin="12,4,8,0"
+                                    Margin="12,4,0,0"
                                     FullMessage="{Binding #ThisControl.FullMessage}"
                                     HorizontalAlignment="Stretch"
                                     TextWrapping="Wrap">

src/Views/CommitDetail.axaml

@@ -9,29 +9,30 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.CommitDetail"
              x:DataType="vm:CommitDetail">
-  <TabControl SelectedIndex="{Binding ActiveTabIndex, Mode=TwoWay}" Padding="4">
+  <TabControl SelectedIndex="{Binding ActiveTabIndex, Mode=TwoWay}" Padding="0,4">
     <!-- Information Page -->
     <TabItem>
       <TabItem.Header>
         <TextBlock Classes="tab_header" Text="{DynamicResource Text.CommitDetail.Info}"/>
       </TabItem.Header>
 
-      <ScrollViewer Offset="{Binding ScrollOffset, Mode=TwoWay}" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+      <ScrollViewer Margin="4,0,0,0" Offset="{Binding ScrollOffset, Mode=TwoWay}" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
         <StackPanel Orientation="Vertical">
           <!-- Base Information -->
           <v:CommitBaseInfo Content="{Binding Commit}"
                             FullMessage="{Binding FullMessage}"
                             SignInfo="{Binding SignInfo}"
                             SupportsContainsIn="True"
                             WebLinks="{Binding WebLinks}"
-                            Children="{Binding Children}"/>
+                            Children="{Binding Children}"
+                            Margin="0,0,12,0"/>
 
           <!-- Line -->
-          <Rectangle Height=".65" Margin="8" Fill="{DynamicResource Brush.Border2}"/>
+          <Rectangle Height=".65" Margin="8,8,12,8" Fill="{DynamicResource Brush.Border2}"/>
 
           <!-- Change List -->
           <ListBox Background="Transparent"
-                   Margin="64,0,8,4"
+                   Margin="64,0,12,4"
                    SelectionMode="Single"
                    ItemsSource="{Binding Changes, Converter={x:Static c:ListConverters.Top100Changes}}"
                    KeyDown="OnCommitListKeyDown">
@@ -72,7 +73,7 @@
           </ListBox>
 
           <!-- Only Top100 Tip -->
-          <TextBlock Margin="108,0,0,16"
+          <TextBlock Margin="108,0,12,16"
                      Text="{DynamicResource Text.CommitDetail.Info.GotoChangesPage}"
                      Foreground="{DynamicResource Brush.FG2}"
                      IsVisible="{Binding Changes, Converter={x:Static c:ListConverters.IsOnlyTop100Shows}}"/>
@@ -84,14 +85,14 @@
       <TabItem.Header>
         <TextBlock Classes="tab_header" Text="{DynamicResource Text.CommitDetail.Changes}"/>
       </TabItem.Header>
-      <v:CommitChanges/>
+      <v:CommitChanges Margin="4,0"/>
     </TabItem>
 
     <TabItem>
       <TabItem.Header>
         <TextBlock Classes="tab_header" Text="{DynamicResource Text.CommitDetail.Files}"/>
       </TabItem.Header>
-      <v:RevisionFiles/>
+      <v:RevisionFiles Margin="4,0"/>
     </TabItem>
   </TabControl>
 </UserControl>

src/Views/DiffView.axaml

@@ -270,7 +270,7 @@
                       <ContentControl.DataTemplates>
                         <DataTemplate DataType="m:RevisionSubmodule">
                           <Border Margin="0,0,0,8" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}" Background="{DynamicResource Brush.Window}">
-                            <v:CommitBaseInfo MaxHeight="256" Margin="0,0,0,4" Content="{Binding Commit}" FullMessage="{Binding FullMessage}"/>
+                            <v:CommitBaseInfo MaxHeight="256" Margin="0,4,8,6" Content="{Binding Commit}" FullMessage="{Binding FullMessage}"/>
                           </Border>
                         </DataTemplate>
                       </ContentControl.DataTemplates>
@@ -294,7 +294,7 @@
                     <ContentControl Content="{Binding New}">
                       <ContentControl.DataTemplates>
                         <DataTemplate DataType="m:RevisionSubmodule">
-                          <v:CommitBaseInfo MaxHeight="256" Margin="0,0,0,4" Content="{Binding Commit}" FullMessage="{Binding FullMessage}"/>
+                          <v:CommitBaseInfo MaxHeight="256" Margin="0,4,8,6" Content="{Binding Commit}" FullMessage="{Binding FullMessage}"/>
                         </DataTemplate>
                       </ContentControl.DataTemplates>
                     </ContentControl>

src/Views/DirHistories.axaml

@@ -120,7 +120,7 @@
                     BorderBrush="{DynamicResource Brush.Border0}"/>
 
       <!-- Commit Detail -->
-      <Border Grid.Column="2" Padding="0,4,4,8" IsVisible="{Binding !IsLoading}">
+      <Border Grid.Column="2" Padding="0,4" IsVisible="{Binding !IsLoading}">
         <ContentControl Content="{Binding Detail, Mode=OneWay}">
           <ContentControl.DataTemplates>
             <DataTemplate DataType="vm:CommitDetail">

src/Views/RevisionFileContentViewer.axaml

@@ -60,10 +60,10 @@
     </DataTemplate>
 
     <DataTemplate DataType="m:RevisionSubmodule">
-      <Grid RowDefinitions="Auto,*" Margin="8,0">
+      <Grid RowDefinitions="Auto,*">
         <TextBlock Grid.Row="0" Margin="0,8,0,0" Text="{DynamicResource Text.CommitDetail.Files.Submodule}" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}"/>
         <ScrollViewer Grid.Row="1" Margin="0,16,0,0" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-          <v:CommitBaseInfo Content="{Binding Commit}" FullMessage="{Binding FullMessage}"/>
+          <v:CommitBaseInfo Content="{Binding Commit}" Margin="4,0,12,0" FullMessage="{Binding FullMessage}"/>
         </ScrollViewer>
       </Grid>
     </DataTemplate>