From 2c08f91f2cdcc07982663533b4f13aa72de60584 Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Tue, 13 Apr 2021 11:11:35 -0700
Subject: [PATCH 1/3] Fix corners, title font weight and margin between title
 and top border

---
 dev/CommonStyles/ContentDialog_themeresources.xaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev/CommonStyles/ContentDialog_themeresources.xaml b/dev/CommonStyles/ContentDialog_themeresources.xaml
index 8607060f5f..6d13efa215 100644
--- a/dev/CommonStyles/ContentDialog_themeresources.xaml
+++ b/dev/CommonStyles/ContentDialog_themeresources.xaml
@@ -42,7 +42,7 @@
     <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
     <GridLength x:Key="ContentDialogButtonSpacing">8</GridLength>
     <Thickness x:Key="ContentDialogTitleMargin">0,0,0,12</Thickness>
-    <Thickness x:Key="ContentDialogPadding">24</Thickness>
+    <Thickness x:Key="ContentDialogPadding">21</Thickness>
     <Thickness x:Key="ContentDialogSeparatorThickness">0,0,0,1</Thickness>
 
     <Style TargetType="ContentDialog" BasedOn="{StaticResource DefaultContentDialogStyle}" />
@@ -205,7 +205,8 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Grid x:Name="LayoutRoot">
+                        <Grid x:Name="LayoutRoot"
+                            contract7Present:CornerRadius="{ThemeResource OverlayCornerRadius}">
                             <Rectangle x:Name="SmokeLayerBackground" Fill="{ThemeResource ContentDialogSmokeFill}" />
                             <Border
                                 x:Name="BackgroundElement"
@@ -225,7 +226,7 @@
                                 <Border.RenderTransform>
                                     <ScaleTransform x:Name="ScaleTransform" />
                                 </Border.RenderTransform>
-                                <Grid x:Name="DialogSpace">
+                                <Grid x:Name="DialogSpace" contract7Present:CornerRadius="{ThemeResource OverlayCornerRadius}">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="*" />
                                         <RowDefinition Height="Auto" />
@@ -252,7 +253,7 @@
                                                 ContentTemplate="{TemplateBinding TitleTemplate}"
                                                 FontSize="20"
                                                 FontFamily="XamlAutoFontFamily"
-                                                FontWeight="Normal"
+                                                FontWeight="SemiBold"
                                                 Foreground="{TemplateBinding Foreground}"
                                                 HorizontalAlignment="Left"
                                                 VerticalAlignment="Top"

From 9e60afb4e98ec0d89c3c1cbfd996f0efa3b3f882 Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Tue, 13 Apr 2021 17:04:45 -0700
Subject: [PATCH 2/3] Fix border stroke

---
 dev/CommonStyles/ContentDialog_themeresources.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/CommonStyles/ContentDialog_themeresources.xaml b/dev/CommonStyles/ContentDialog_themeresources.xaml
index 6d13efa215..7f39ff2707 100644
--- a/dev/CommonStyles/ContentDialog_themeresources.xaml
+++ b/dev/CommonStyles/ContentDialog_themeresources.xaml
@@ -12,7 +12,7 @@
             <StaticResource x:Key="ContentDialogBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
             <StaticResource x:Key="ContentDialogSmokeFill" ResourceKey="SmokeFillColorDefaultBrush" />
             <StaticResource x:Key="ContentDialogTopOverlay" ResourceKey="LayerFillColorAltBrush" />
-            <StaticResource x:Key="ContentDialogBorderBrush" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="ContentDialogBorderBrush" ResourceKey="SurfaceStrokeColorDefault" />
             <StaticResource x:Key="ContentDialogSeparatorBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
             <Thickness x:Key="ContentDialogBorderWidth">1</Thickness>
         </ResourceDictionary>
@@ -30,7 +30,7 @@
             <StaticResource x:Key="ContentDialogBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
             <StaticResource x:Key="ContentDialogSmokeFill" ResourceKey="SmokeFillColorDefaultBrush" />
             <StaticResource x:Key="ContentDialogTopOverlay" ResourceKey="LayerFillColorAltBrush" />
-            <StaticResource x:Key="ContentDialogBorderBrush" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="ContentDialogBorderBrush" ResourceKey="SurfaceStrokeColorDefault" />
             <StaticResource x:Key="ContentDialogSeparatorBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
             <Thickness x:Key="ContentDialogBorderWidth">1</Thickness>
         </ResourceDictionary>

From 12fd88a52c23c8b78c0bbd2baaa2eede6ce3303b Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Wed, 14 Apr 2021 16:02:33 -0700
Subject: [PATCH 3/3] Change border to 24 again

---
 dev/CommonStyles/ContentDialog_themeresources.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/CommonStyles/ContentDialog_themeresources.xaml b/dev/CommonStyles/ContentDialog_themeresources.xaml
index 7f39ff2707..d77ef24e15 100644
--- a/dev/CommonStyles/ContentDialog_themeresources.xaml
+++ b/dev/CommonStyles/ContentDialog_themeresources.xaml
@@ -42,7 +42,7 @@
     <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
     <GridLength x:Key="ContentDialogButtonSpacing">8</GridLength>
     <Thickness x:Key="ContentDialogTitleMargin">0,0,0,12</Thickness>
-    <Thickness x:Key="ContentDialogPadding">21</Thickness>
+    <Thickness x:Key="ContentDialogPadding">24</Thickness>
     <Thickness x:Key="ContentDialogSeparatorThickness">0,0,0,1</Thickness>
 
     <Style TargetType="ContentDialog" BasedOn="{StaticResource DefaultContentDialogStyle}" />