From 885dccb52b287002fa37c73cde3a6484ca661fe5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 24 Jun 2024 19:52:00 +0800
Subject: [PATCH] ux: multiple layout style changes

---
 src/Models/Notification.cs            |  5 ++
 src/Resources/Locales/en_US.axaml     |  1 +
 src/Resources/Locales/zh_CN.axaml     |  1 +
 src/Resources/Locales/zh_TW.axaml     |  1 +
 src/Views/AddRemote.axaml             |  2 +-
 src/Views/AddSubmodule.axaml          |  2 +-
 src/Views/Apply.axaml                 |  2 +-
 src/Views/Archive.axaml               |  2 +-
 src/Views/CheckoutCommit.axaml        | 20 ++++----
 src/Views/CherryPick.axaml            |  2 +-
 src/Views/DropStash.axaml             |  2 +-
 src/Views/Fetch.axaml                 |  2 +-
 src/Views/GitFlowStart.axaml          |  2 +-
 src/Views/InitGitFlow.axaml           |  2 +-
 src/Views/LFSTrackCustomPattern.axaml |  2 +-
 src/Views/Launcher.axaml              | 70 ++++++++++++++-------------
 src/Views/PushTag.axaml               |  2 +-
 src/Views/RenameBranch.axaml          |  2 +-
 src/Views/Reset.axaml                 |  4 +-
 src/Views/Reword.axaml                | 35 +++++---------
 src/Views/Squash.axaml                | 26 +++++-----
 src/Views/StashChanges.axaml          |  2 +-
 22 files changed, 96 insertions(+), 93 deletions(-)

diff --git a/src/Models/Notification.cs b/src/Models/Notification.cs
index 2d175da9..22cf1e67 100644
--- a/src/Models/Notification.cs
+++ b/src/Models/Notification.cs
@@ -4,6 +4,11 @@
     {
         public bool IsError { get; set; } = false;
         public string Message { get; set; } = string.Empty;
+
+        public void CopyMessage()
+        {
+            App.CopyText(Message);
+        }
     }
 
     public interface INotificationReceiver
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 19071b59..206a270e 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -115,6 +115,7 @@
   <x:String x:Key="Text.Configure.User" xml:space="preserve">User Name</x:String>
   <x:String x:Key="Text.Configure.User.Placeholder" xml:space="preserve">User name for this repository</x:String>
   <x:String x:Key="Text.Copy" xml:space="preserve">Copy</x:String>
+  <x:String x:Key="Text.CopyMessage" xml:space="preserve">COPY MESSAGE</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Copy Path</x:String>
   <x:String x:Key="Text.CopyFileName" xml:space="preserve">Copy File Name</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Create Branch...</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 1eaa9c8b..4490fee4 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -118,6 +118,7 @@
   <x:String x:Key="Text.Configure.User" xml:space="preserve">用户名</x:String>
   <x:String x:Key="Text.Configure.User.Placeholder" xml:space="preserve">应用于本仓库的用户名</x:String>
   <x:String x:Key="Text.Copy" xml:space="preserve">复制</x:String>
+  <x:String x:Key="Text.CopyMessage" xml:space="preserve">复制内容</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">复制路径</x:String>
   <x:String x:Key="Text.CopyFileName" xml:space="preserve">复制文件名</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">新建分支 ...</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 4e0a2d0e..c5e68be8 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -118,6 +118,7 @@
   <x:String x:Key="Text.Configure.User" xml:space="preserve">使用者名稱</x:String>
   <x:String x:Key="Text.Configure.User.Placeholder" xml:space="preserve">應用於本倉庫的使用者名稱</x:String>
   <x:String x:Key="Text.Copy" xml:space="preserve">複製</x:String>
+  <x:String x:Key="Text.CopyMessage" xml:space="preserve">複製內容</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">複製路徑</x:String>
   <x:String x:Key="Text.CopyFileName" xml:space="preserve">複製檔名</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">新建分支 ...</x:String>
diff --git a/src/Views/AddRemote.axaml b/src/Views/AddRemote.axaml
index 4123d501..9bcbb79c 100644
--- a/src/Views/AddRemote.axaml
+++ b/src/Views/AddRemote.axaml
@@ -14,7 +14,7 @@
                Classes="bold"
                Text="{DynamicResource Text.Remote.AddTitle}"/>
 
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/AddSubmodule.axaml b/src/Views/AddSubmodule.axaml
index 32ad9dc2..598d8897 100644
--- a/src/Views/AddSubmodule.axaml
+++ b/src/Views/AddSubmodule.axaml
@@ -13,7 +13,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Submodule.Add}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/Apply.axaml b/src/Views/Apply.axaml
index cb4fc6f1..75ed8e29 100644
--- a/src/Views/Apply.axaml
+++ b/src/Views/Apply.axaml
@@ -14,7 +14,7 @@
                Classes="bold"
                Text="{DynamicResource Text.Apply.Title}"/>
 
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/Archive.axaml b/src/Views/Archive.axaml
index 5dc79018..33b58fe4 100644
--- a/src/Views/Archive.axaml
+++ b/src/Views/Archive.axaml
@@ -13,7 +13,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Archive.Title}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/CheckoutCommit.axaml b/src/Views/CheckoutCommit.axaml
index 679299d3..35f79019 100644
--- a/src/Views/CheckoutCommit.axaml
+++ b/src/Views/CheckoutCommit.axaml
@@ -12,15 +12,7 @@
                Classes="bold"
                Text="{DynamicResource Text.Checkout.Commit}" />
 
-    <StackPanel Orientation="Horizontal" Margin="0,12,0,16">
-      <Path Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="DarkOrange"/>
-      <TextBlock Margin="4,0,0,0" 
-                 Text="{DynamicResource Text.Checkout.Commit.Warning}"
-                 TextWrapping="Wrap"
-                 FontStyle="Italic"/>
-    </StackPanel>
-    
-    <Grid RowDefinitions="32,Auto" ColumnDefinitions="Auto,*" ClipToBounds="True" HorizontalAlignment="Center">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,Auto,Auto" ColumnDefinitions="Auto,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -44,6 +36,16 @@
                      GroupName="LocalChanges"
                      Margin="8,0,0,0" />
       </StackPanel>
+
+      <Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="Auto,*" Margin="0,6,0,0">
+        <Path Grid.Column="0" 
+              Width="14" Height="14" 
+              Data="{StaticResource Icons.Error}" 
+              Fill="DarkOrange"/>
+        <TextBlock Grid.Column="1" Margin="8,0,0,0"
+                   Text="{DynamicResource Text.Checkout.Commit.Warning}"
+                   TextWrapping="Wrap"/>
+      </Grid>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/CherryPick.axaml b/src/Views/CherryPick.axaml
index e7b3cf67..9163526c 100644
--- a/src/Views/CherryPick.axaml
+++ b/src/Views/CherryPick.axaml
@@ -12,7 +12,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.CherryPick}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="100,*">
       <TextBlock Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/DropStash.axaml b/src/Views/DropStash.axaml
index 44cbee67..bc18ccb1 100644
--- a/src/Views/DropStash.axaml
+++ b/src/Views/DropStash.axaml
@@ -21,7 +21,7 @@
               HorizontalAlignment="Left" VerticalAlignment="Center"
               Data="{StaticResource Icons.Stashes}"/>
 
-        <TextBlock VerticalAlignment="Center" Text="{Binding Stash.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+        <TextBlock VerticalAlignment="Center" Classes="monospace" Text="{Binding Stash.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
         <TextBlock VerticalAlignment="Center" Text="{Binding Stash.Message}" Margin="8,0,0,0"/>
       </StackPanel>
     </Grid>
diff --git a/src/Views/Fetch.axaml b/src/Views/Fetch.axaml
index 202a96fa..aaf9bec6 100644
--- a/src/Views/Fetch.axaml
+++ b/src/Views/Fetch.axaml
@@ -12,7 +12,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Fetch.Title}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/GitFlowStart.axaml b/src/Views/GitFlowStart.axaml
index 211d9fe8..e81048ff 100644
--- a/src/Views/GitFlowStart.axaml
+++ b/src/Views/GitFlowStart.axaml
@@ -22,7 +22,7 @@
                Classes="bold"
                Text="{DynamicResource Text.GitFlow.StartHotfixTitle}"
                IsVisible="{Binding IsHotfix}"/>
-    <Grid Margin="0,16,0,0" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/InitGitFlow.axaml b/src/Views/InitGitFlow.axaml
index 83faf66f..632ec9dc 100644
--- a/src/Views/InitGitFlow.axaml
+++ b/src/Views/InitGitFlow.axaml
@@ -13,7 +13,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.GitFlow.Init}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,8,32,32,32,32" ColumnDefinitions="150,*">
+    <Grid Margin="8,16,0,0" RowDefinitions="32,32,8,32,32,32,32" ColumnDefinitions="Auto,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/LFSTrackCustomPattern.axaml b/src/Views/LFSTrackCustomPattern.axaml
index 6333dcd2..40403d4a 100644
--- a/src/Views/LFSTrackCustomPattern.axaml
+++ b/src/Views/LFSTrackCustomPattern.axaml
@@ -14,7 +14,7 @@
                Classes="bold"
                Text="{DynamicResource Text.GitLFS.AddTrackPattern.Title}"/>
     
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 84ecdd3a..e2a6d190 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -253,7 +253,7 @@
     <Grid Grid.Row="1" Margin="0,36,0,0" IsVisible="{Binding ActivePage.Popup, Converter={x:Static ObjectConverters.IsNotNull}}" ClipToBounds="True">
       <Border Background="Transparent" PointerPressed="OnPopupCancelByClickMask"/>
 
-      <Border Width="500" HorizontalAlignment="Center" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #8F000000)" CornerRadius="0,0,4,4" ClipToBounds="True">                
+      <Border Width="500" HorizontalAlignment="Center" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #8F000000)" CornerRadius="0,0,8,8" ClipToBounds="True">                
         <ContentControl Content="{Binding ActivePage.Popup}" Background="{DynamicResource Brush.Popup}">
           <ContentControl.DataTemplates>
             <DataTemplate DataType="vm:Popup">  
@@ -298,40 +298,44 @@
         <ItemsControl ItemsSource="{Binding ActivePage.Notifications}">
           <ItemsControl.ItemTemplate>
             <DataTemplate DataType="m:Notification">
-              <Grid Width="320" Margin="8">
-                <Border Background="{DynamicResource Brush.Window}" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="1" CornerRadius="4" Effect="drop-shadow(0 0 8 #40000000)"/>
+              <Border Margin="10,6" HorizontalAlignment="Stretch" VerticalAlignment="Top" Effect="drop-shadow(0 0 12 #A0000000)">
+                <Border Padding="8" CornerRadius="6" Background="{DynamicResource Brush.Popup}">
+                  <Grid RowDefinitions="26,Auto,32">
+                    <StackPanel Grid.Row="0" Margin="8,0,0,0" Orientation="Horizontal" IsVisible="{Binding IsError}">
+                      <Path Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red"/>
+                      <TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Error}"/>
+                    </StackPanel>
+                    <StackPanel Grid.Row="0" Margin="8,0,0,0" Orientation="Horizontal" IsVisible="{Binding !IsError}">
+                      <Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green"/>
+                      <TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Info}"/>
+                    </StackPanel>
 
-                <Grid Margin="8" RowDefinitions="26,Auto,Auto">
-                  <StackPanel Grid.Row="0" Margin="8,0,0,0" Orientation="Horizontal" IsVisible="{Binding IsError}">
-                    <Path Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red"/>
-                    <TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Error}"/>
-                  </StackPanel>
-                  <StackPanel Grid.Row="0" Margin="8,0,0,0" Orientation="Horizontal" IsVisible="{Binding !IsError}">
-                    <Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green"/>
-                    <TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Info}"/>
-                  </StackPanel>
+                    <TextBox Grid.Row="1"
+                             Classes="no_background no_border"
+                             IsReadOnly="True"
+                             TextWrapping="Wrap"
+                             ScrollViewer.VerticalScrollBarVisibility="Auto"
+                             MaxHeight="100"
+                             Margin="8" Padding="0"
+                             VerticalContentAlignment="Top"
+                             Text="{Binding Message}"/>
 
-                  <TextBox Grid.Row="1"
-                           Classes="no_background no_border"
-                           IsReadOnly="True"
-                           TextWrapping="Wrap"
-                           ScrollViewer.VerticalScrollBarVisibility="Auto"
-                           MaxHeight="100"
-                           Margin="8" Padding="0"
-                           VerticalContentAlignment="Top"
-                           Text="{Binding Message}"/>
-                  <Button Grid.Row="2"
-                          Classes="flat primary"
-                          Height="30"
-                          Margin="4,0"
-                          Command="{Binding #me.((vm:Launcher)DataContext).ActivePage.DismissNotification}"
-                          CommandParameter="{Binding}"
-                          Content="{DynamicResource Text.Close}"
-                          HorizontalAlignment="Right"
-                          HorizontalContentAlignment="Center"
-                          VerticalContentAlignment="Center"/>
-                </Grid>
-              </Grid>
+                    <StackPanel Grid.Row="2" Margin="0,4,0,0" Orientation="Horizontal" HorizontalAlignment="Right">
+                      <Button Classes="flat"
+                              Margin="0,0,8,0"
+                              Command="{Binding CopyMessage}"
+                              Content="{DynamicResource Text.CopyMessage}"
+                              IsVisible="{Binding IsError}"/>
+                      
+                      <Button Classes="flat primary"
+                              Margin="0,0"
+                              Command="{Binding #me.((vm:Launcher)DataContext).ActivePage.DismissNotification}"
+                              CommandParameter="{Binding}"
+                              Content="{DynamicResource Text.Close}"/>
+                    </StackPanel>
+                  </Grid>
+                </Border>
+              </Border>
             </DataTemplate>
           </ItemsControl.ItemTemplate>
         </ItemsControl>
diff --git a/src/Views/PushTag.axaml b/src/Views/PushTag.axaml
index 1b24dc1b..aa35f5aa 100644
--- a/src/Views/PushTag.axaml
+++ b/src/Views/PushTag.axaml
@@ -12,7 +12,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.PushTag}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/RenameBranch.axaml b/src/Views/RenameBranch.axaml
index 82b89127..c573eeae 100644
--- a/src/Views/RenameBranch.axaml
+++ b/src/Views/RenameBranch.axaml
@@ -13,7 +13,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.RenameBranch}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/Reset.axaml b/src/Views/Reset.axaml
index 8afc6e2e..238a7849 100644
--- a/src/Views/Reset.axaml
+++ b/src/Views/Reset.axaml
@@ -11,7 +11,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Reset}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -27,7 +27,7 @@
                  Text="{DynamicResource Text.Reset.MoveTo}"/>
       <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="Auto,Auto,*" Height="20" VerticalAlignment="Center">
         <Path Grid.Column="0" Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
-        <TextBlock Grid.Column="1" Text="{Binding To.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+        <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding To.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
         <TextBlock Grid.Column="2" Text="{Binding To.Subject}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
       </Grid>
 
diff --git a/src/Views/Reword.axaml b/src/Views/Reword.axaml
index 9767b014..fdc77bc2 100644
--- a/src/Views/Reword.axaml
+++ b/src/Views/Reword.axaml
@@ -12,30 +12,17 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Reword}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,160,Auto" ColumnDefinitions="100,*">
-      <TextBlock Grid.Row="0" Grid.Column="0"
-                 HorizontalAlignment="Right" VerticalAlignment="Center"
-                 Margin="0,0,8,0"
-                 Text="{DynamicResource Text.Reword.On}"/>
-      <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,Auto,*" Height="20" VerticalAlignment="Center">
-        <Path Grid.Column="0" Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
-        <TextBlock Grid.Column="1" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
-        <TextBlock Grid.Column="2" Text="{Binding Head.Subject}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
-      </Grid>
 
-      <TextBlock Grid.Row="1" Grid.Column="0"
-                 HorizontalAlignment="Right" VerticalAlignment="Top"
-                 Margin="0,8,8,0"
-                 Text="{DynamicResource Text.Reword.Message}"/>
-      <v:CommitMessageTextBox Grid.Row="1" Grid.Column="1"
-                              Margin="0,5,0,0"
-                              Text="{Binding Message, Mode=TwoWay}"/>
-      
-      <TextBlock Grid.Row="2" Grid.Column="1"
-                 Margin="0,4,0,0"
-                 Text="{DynamicResource Text.Reword.Tip}"
-                 TextWrapping="Wrap"
-                 Foreground="{DynamicResource Brush.FG2}"/>
-    </Grid>
+    <StackPanel Margin="8,16,8,0" Orientation="Horizontal" HorizontalAlignment="Right">
+      <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
+      <TextBlock Classes="monospace" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+    </StackPanel>
+    
+    <v:CommitMessageTextBox Height="120" Margin="8,5,8,0" Text="{Binding Message, Mode=TwoWay}"/>
+    
+    <TextBlock Margin="8"
+               Text="{DynamicResource Text.Reword.Tip}"
+               TextWrapping="Wrap"
+               Foreground="{DynamicResource Brush.FG2}"/>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Squash.axaml b/src/Views/Squash.axaml
index b33e8077..cdfcac94 100644
--- a/src/Views/Squash.axaml
+++ b/src/Views/Squash.axaml
@@ -12,14 +12,14 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Squash}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,32" ColumnDefinitions="100,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="28,28,120,Auto" ColumnDefinitions="100,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Squash.Head}"/>
       <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,Auto,*" Height="20" VerticalAlignment="Center">
         <Path Grid.Column="0" Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
-        <TextBlock Grid.Column="1" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+        <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
         <TextBlock Grid.Column="2" Text="{Binding Head.Subject}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
       </Grid>
 
@@ -29,21 +29,23 @@
                  Text="{DynamicResource Text.Squash.To}"/>
       <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="Auto,Auto,*" Height="20" VerticalAlignment="Center">
         <Path Grid.Column="0" Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
-        <TextBlock Grid.Column="1" Text="{Binding Parent.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+        <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding Parent.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
         <TextBlock Grid.Column="2" Text="{Binding Parent.Subject}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
       </Grid>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
-                 HorizontalAlignment="Right" VerticalAlignment="Center"
-                 Margin="0,0,8,0"
+                 HorizontalAlignment="Right" VerticalAlignment="Top"
+                 Margin="0,5,8,0"
                  Text="{DynamicResource Text.Squash.Message}"/>
-      <TextBox Grid.Row="2" Grid.RowSpan="3" Grid.Column="1"
-               Margin="0,4,0,0"
-               CornerRadius="2"
-               AcceptsReturn="True"
-               VerticalContentAlignment="Top"
-               Text="{Binding Message, Mode=TwoWay}"
-               v:AutoFocusBehaviour.IsEnabled="True"/>
+      <v:CommitMessageTextBox Grid.Row="2" Grid.Column="1"
+                              Margin="0,4,0,0"
+                              Text="{Binding Message, Mode=TwoWay}"/>
+
+      <TextBlock Grid.Row="3" Grid.Column="1"
+                 Margin="0,4,0,0"
+                 Text="{DynamicResource Text.Reword.Tip}"
+                 TextWrapping="Wrap"
+                 Foreground="{DynamicResource Brush.FG2}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/StashChanges.axaml b/src/Views/StashChanges.axaml
index f87ed373..36ee1917 100644
--- a/src/Views/StashChanges.axaml
+++ b/src/Views/StashChanges.axaml
@@ -13,7 +13,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Stash.Title}"/>
-    <Grid Margin="8,16,0,0" RowDefinitions="32,Auto" ColumnDefinitions="Auto,*">
+    <Grid Margin="8,16,0,0" RowDefinitions="32,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="8,0" Text="{DynamicResource Text.Stash.Message}"/>
       <TextBox Grid.Column="1" 
                Height="26"