From 701b7b3d362b7e1cdebbe364229d3792d3003fd9 Mon Sep 17 00:00:00 2001
From: Georgi Baychev <georgi.baychev@gmail.com>
Date: Tue, 14 Jan 2020 20:13:48 +0100
Subject: [PATCH] Improve the ColorPickupFlyout UI #2994

---
 src/cascadia/TerminalApp/ColorPickupFlyout.xaml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/cascadia/TerminalApp/ColorPickupFlyout.xaml b/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
index fedefff3fe8..44cab56bc27 100644
--- a/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
+++ b/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
@@ -13,7 +13,7 @@
     </Flyout.FlyoutPresenterStyle>
     <StackPanel Orientation="Horizontal">
         <StackPanel>
-            <VariableSizedWrapGrid Orientation="Horizontal" MaximumRowsOrColumns="4" HorizontalAlignment="Center">
+            <VariableSizedWrapGrid Orientation="Horizontal" MaximumRowsOrColumns="4" HorizontalAlignment="Center" Margin="0, 3, 0, 0">
                 <VariableSizedWrapGrid.Resources>
                     <Style TargetType="Rectangle">
                         <Setter Property="Width" Value="30"/>
@@ -133,13 +133,6 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <Grid.Resources>
-                <Style TargetType="Button">
-                    <Setter Property="Margin" Value="0, 5, 0, 0"/>
-                    <Setter Property="MinWidth" Value="20"/>
-                    <Setter Property="MinHeight" Value="12"/>
-                </Style>
-            </Grid.Resources>
             <ColorPicker x:Name="customColorPicker" 
                      IsMoreButtonVisible="True"
                      IsColorSliderVisible="False"
@@ -152,7 +145,7 @@
                      Grid.Row="0"
                      >
             </ColorPicker>
-            <Button x:Name="btnOk" Click="CustomColorButton_Click" Grid.Row="1" >Ok</Button>
+            <Button x:Name="btnOk" Click="CustomColorButton_Click" Grid.Row="1" HorizontalAlignment="Center" MinWidth="130" MinHeight="12" Margin="0, 5, 0, 0">Ok</Button>
         </Grid>
     </StackPanel>
 </Flyout>