From 3d9dcc6973adbc4c01ddefb33d0926547910360a Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Thu, 8 Apr 2021 18:57:23 -0700
Subject: [PATCH 1/7] update close button

---
 dev/TeachingTip/TeachingTip.xaml              |  18 +--
 .../TeachingTip_rs1_themeresources.xaml       | 127 +++++++++++++++++-
 2 files changed, 130 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 dev/TeachingTip/TeachingTip.xaml
 mode change 100644 => 100755 dev/TeachingTip/TeachingTip_rs1_themeresources.xaml

diff --git a/dev/TeachingTip/TeachingTip.xaml b/dev/TeachingTip/TeachingTip.xaml
old mode 100644
new mode 100755
index 6dfb682233..237a026b37
--- a/dev/TeachingTip/TeachingTip.xaml
+++ b/dev/TeachingTip/TeachingTip.xaml
@@ -618,17 +618,7 @@
                                             </StackPanel>
                                         </ScrollViewer>
                                         <Button x:Name="AlternateCloseButton"
-                                                Width="{StaticResource TeachingTipAlternateCloseButtonSize}"
-                                                Height="{StaticResource TeachingTipAlternateCloseButtonSize}"
-                                                Background="Transparent"
-                                                VerticalAlignment="Top"
-                                                HorizontalAlignment="Right"
-                                                BorderThickness="{ThemeResource TeachingTipAlternateCloseButtonBorderThickness}">
-                                            <Viewbox Width="{StaticResource TeachingTipAlternateCloseButtonGlyphSize}"
-                                                     Height="{StaticResource TeachingTipAlternateCloseButtonGlyphSize}">
-                                                <SymbolIcon Symbol="Cancel"/>
-                                            </Viewbox>
-                                        </Button>
+                                                        Style="{ThemeResource AlternateCloseButtonStyle}"/>
                                     </Grid>
                                 </Grid>
                                 <Grid x:Name="TopHighlightLeft"
@@ -656,4 +646,10 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+
+
+
+
+    
 </ResourceDictionary>
diff --git a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
old mode 100644
new mode 100755
index 6cf966b312..dcc643dd0f
--- a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
+++ b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
@@ -2,9 +2,28 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.UI.Xaml.Controls">
+    xmlns:local="using:Microsoft.UI.Xaml.Controls"
+    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
+    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackground"                                 ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPointerOver"                      ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPressed"                          ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundDisabled"                         ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForeground"                                 ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPointerOver"                      ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPressed"                          ResourceKey="TextFillColorSecondaryBrush"/>
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundDisabled"                         ResourceKey="TextFillColorDisabledBrush" />
+
+
+
+
+
+
+
+
+
             <StaticResource x:Key="TeachingTipBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush"/>
             <SolidColorBrush x:Key="TeachingTipTopHighlightBrush" Color="#0DFFFFFF"/>
             <StaticResource x:Key="TeachingTipTransientBackground" ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
@@ -15,6 +34,15 @@
             <Thickness x:Key="TeachingTipAlternateCloseButtonBorderThickness">0</Thickness>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackground"                                 ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPointerOver"                      ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPressed"                          ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundDisabled"                         ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForeground"                                 ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPointerOver"                      ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPressed"                          ResourceKey="TextFillColorSecondaryBrush"/>
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundDisabled"                         ResourceKey="TextFillColorDisabledBrush" />
+
             <StaticResource x:Key="TeachingTipBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush"/>
             <SolidColorBrush x:Key="TeachingTipTopHighlightBrush" Color="#99FFFFFF"/>
             <StaticResource x:Key="TeachingTipTransientBackground" ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
@@ -25,6 +53,16 @@
             <Thickness x:Key="TeachingTipAlternateCloseButtonBorderThickness">0</Thickness>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackground"                                 ResourceKey="SystemControlBackgroundBaseLowBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPointerOver"                      ResourceKey="SystemControlHighlightChromeHighBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPressed"                          ResourceKey="SystemControlHighlightChromeHighBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundDisabled"                         ResourceKey="SystemControlBackgroundBaseLowBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForeground"                                 ResourceKey="SystemControlForegroundBaseMediumBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPointerOver"                      ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPressed"                          ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundDisabled"                         ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+
             <StaticResource x:Key="TeachingTipBorderBrush" ResourceKey="SystemControlTransientBorderBrush"/>
             <SolidColorBrush x:Key="TeachingTipTopHighlightBrush" Color="Transparent"/>
             <StaticResource x:Key="TeachingTipTransientBackground" ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
@@ -41,8 +79,8 @@
     <x:Double x:Key="TeachingTipMinWidth">320</x:Double>
     <x:Double x:Key="TeachingTipMaxWidth">336</x:Double>
 
-    <Thickness x:Key="TeachingTipRightButtonMargin">6,12,0,0</Thickness>
-    <Thickness x:Key="TeachingTipLeftButtonMargin">0,12,6,0</Thickness>
+    <Thickness x:Key="TeachingTipRightButtonMargin">4,12,0,0</Thickness>
+    <Thickness x:Key="TeachingTipLeftButtonMargin">0,12,4,0</Thickness>
 
     <Thickness x:Key="TeachingTipMainContentPresentMargin">0,12,0,0</Thickness>
     <Thickness x:Key="TeachingTipMainContentAbsentMargin">0,0,0,0</Thickness>
@@ -68,11 +106,92 @@
     <GridLength x:Key="TeachingTipTailMargin">10</GridLength>
 
     <x:Double x:Key="TeachingTipAlternateCloseButtonSize">40</x:Double>
-    <x:Double x:Key="TeachingTipAlternateCloseButtonGlyphSize">12</x:Double>
+    <x:Double x:Key="TeachingTipAlternateCloseButtonGlyphSize">16</x:Double>
+    <Thickness x:Key="TeachingTipAlternateCloseButtonPadding">5</Thickness>
+    <x:String x:Key="TeachingTipAlternateCloseButtonGlyph">&#xE711;</x:String>
+    
 
     <Thickness x:Key="TeachingTipContentMargin">12</Thickness>
 
     <x:Double x:Key="TeachingTipTopHighlightHeight">1</x:Double>
     <x:Double x:Key="TeachingTipBorderThickness">1</x:Double>
     <Thickness x:Key="TeachingTipTopHighlightOffsetForBorder">0,1,0,0</Thickness>
+
+
+    <Style x:Key="AlternateCloseButtonStyle" TargetType="Button">
+        <Setter Property="Width" Value="{ThemeResource TeachingTipAlternateCloseButtonSize}" />
+        <Setter Property="Height" Value="{ThemeResource TeachingTipAlternateCloseButtonSize}" />
+        <Setter Property="Background" Value="{ThemeResource TeachingTipAlternateCloseButtonBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource TeachingTipAlternateCloseButtonForeground}" />
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource TeachingTipAlternateCloseButtonGlyphSize}" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+        <Setter Property="Padding" Value="{ThemeResource TeachingTipAlternateCloseButtonPadding}"/>
+        <Setter Property="BorderThickness" Value="{ThemeResource TeachingTipAlternateCloseButtonBorderThickness}" />
+        <Setter Property="Content" Value="{ThemeResource TeachingTipAlternateCloseButtonGlyph}"/>
+        <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
+        <Setter Property="FocusVisualMargin" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Padding="{TemplateBinding Padding}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonBackgroundPointerOver}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonForegroundPointerOver}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonBackgroundPressed}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonForegroundPressed}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonBackgroundDisabled}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonForegroundDisabled}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <ContentPresenter x:Name="ContentPresenter"
+                                AutomationProperties.AccessibilityView="Raw"
+                                contract7Present:BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                Foreground="{TemplateBinding Foreground}"
+                                FontFamily="{TemplateBinding FontFamily}"
+                                FontSize="{TemplateBinding FontSize}"
+                                Content="{TemplateBinding Content}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+                                contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}">
+                        </ContentPresenter>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>

From 21791dd5ffe5ce4d1867c2c67dc6d791be69f193 Mon Sep 17 00:00:00 2001
From: Vsevolod <sevkorobot@gmail.com>
Date: Thu, 8 Apr 2021 21:07:04 -0700
Subject: [PATCH 2/7] Update TeachingTip.xaml

---
 dev/TeachingTip/TeachingTip.xaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/dev/TeachingTip/TeachingTip.xaml b/dev/TeachingTip/TeachingTip.xaml
index 237a026b37..6610bfd591 100755
--- a/dev/TeachingTip/TeachingTip.xaml
+++ b/dev/TeachingTip/TeachingTip.xaml
@@ -646,10 +646,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-
-
-
-
-
-    
 </ResourceDictionary>

From b54f014ccf1d12aa839c5d0e9d8c5bc03f019bbc Mon Sep 17 00:00:00 2001
From: Vsevolod <sevkorobot@gmail.com>
Date: Thu, 8 Apr 2021 21:09:58 -0700
Subject: [PATCH 3/7] Code cleanup

---
 .../TeachingTip_rs1_themeresources.xaml       | 58 +++++++------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
index dcc643dd0f..75672435e6 100755
--- a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
+++ b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
@@ -15,22 +15,13 @@
             <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPointerOver"                      ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPressed"                          ResourceKey="TextFillColorSecondaryBrush"/>
             <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundDisabled"                         ResourceKey="TextFillColorDisabledBrush" />
-
-
-
-
-
-
-
-
-
-            <StaticResource x:Key="TeachingTipBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush"/>
-            <SolidColorBrush x:Key="TeachingTipTopHighlightBrush" Color="#0DFFFFFF"/>
-            <StaticResource x:Key="TeachingTipTransientBackground" ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
-            <StaticResource x:Key="TeachingTipForegroundBrush" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="TeachingTipBackgroundBrush" ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
-            <StaticResource x:Key="TeachingTipTitleForegroundBrush" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="TeachingTipSubtitleForegroundBrush" ResourceKey="TextFillColorPrimaryBrush"/>
+            <StaticResource x:Key="TeachingTipBorderBrush"                                                    ResourceKey="SurfaceStrokeColorDefaultBrush"/>
+            <SolidColorBrush x:Key="TeachingTipTopHighlightBrush"                                             Color="#0DFFFFFF"/>
+            <StaticResource x:Key="TeachingTipTransientBackground"                                            ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
+            <StaticResource x:Key="TeachingTipForegroundBrush"                                                ResourceKey="TextFillColorPrimaryBrush"/>
+            <StaticResource x:Key="TeachingTipBackgroundBrush"                                                ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
+            <StaticResource x:Key="TeachingTipTitleForegroundBrush"                                           ResourceKey="TextFillColorPrimaryBrush"/>
+            <StaticResource x:Key="TeachingTipSubtitleForegroundBrush"                                        ResourceKey="TextFillColorPrimaryBrush"/>
             <Thickness x:Key="TeachingTipAlternateCloseButtonBorderThickness">0</Thickness>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
@@ -42,14 +33,13 @@
             <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPointerOver"                      ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPressed"                          ResourceKey="TextFillColorSecondaryBrush"/>
             <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundDisabled"                         ResourceKey="TextFillColorDisabledBrush" />
-
-            <StaticResource x:Key="TeachingTipBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush"/>
-            <SolidColorBrush x:Key="TeachingTipTopHighlightBrush" Color="#99FFFFFF"/>
-            <StaticResource x:Key="TeachingTipTransientBackground" ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
-            <StaticResource x:Key="TeachingTipForegroundBrush" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="TeachingTipBackgroundBrush" ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
-            <StaticResource x:Key="TeachingTipTitleForegroundBrush" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="TeachingTipSubtitleForegroundBrush" ResourceKey="TextFillColorPrimaryBrush"/>
+            <StaticResource x:Key="TeachingTipBorderBrush"                                                    ResourceKey="SurfaceStrokeColorDefaultBrush"/>
+            <SolidColorBrush x:Key="TeachingTipTopHighlightBrush"                                             Color="#99FFFFFF"/>
+            <StaticResource x:Key="TeachingTipTransientBackground"                                            ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
+            <StaticResource x:Key="TeachingTipForegroundBrush"                                                ResourceKey="TextFillColorPrimaryBrush"/>
+            <StaticResource x:Key="TeachingTipBackgroundBrush"                                                ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
+            <StaticResource x:Key="TeachingTipTitleForegroundBrush"                                           ResourceKey="TextFillColorPrimaryBrush"/>
+            <StaticResource x:Key="TeachingTipSubtitleForegroundBrush"                                        ResourceKey="TextFillColorPrimaryBrush"/>
             <Thickness x:Key="TeachingTipAlternateCloseButtonBorderThickness">0</Thickness>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
@@ -61,15 +51,13 @@
             <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPointerOver"                      ResourceKey="SystemControlHighlightAltBaseHighBrush" />
             <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPressed"                          ResourceKey="SystemControlHighlightAltBaseHighBrush" />
             <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundDisabled"                         ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-
-
-            <StaticResource x:Key="TeachingTipBorderBrush" ResourceKey="SystemControlTransientBorderBrush"/>
-            <SolidColorBrush x:Key="TeachingTipTopHighlightBrush" Color="Transparent"/>
-            <StaticResource x:Key="TeachingTipTransientBackground" ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
-            <StaticResource x:Key="TeachingTipForegroundBrush" ResourceKey="SystemControlForegroundBaseHighBrush"/>
-            <StaticResource x:Key="TeachingTipBackgroundBrush" ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
-            <StaticResource x:Key="TeachingTipTitleForegroundBrush" ResourceKey="SystemControlForegroundBaseHighBrush"/>
-            <StaticResource x:Key="TeachingTipSubtitleForegroundBrush" ResourceKey="SystemControlForegroundBaseHighBrush"/>
+            <StaticResource x:Key="TeachingTipBorderBrush"                                                    ResourceKey="SystemControlTransientBorderBrush"/>
+            <SolidColorBrush x:Key="TeachingTipTopHighlightBrush"                                             Color="Transparent"/>
+            <StaticResource x:Key="TeachingTipTransientBackground"                                            ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
+            <StaticResource x:Key="TeachingTipForegroundBrush"                                                ResourceKey="SystemControlForegroundBaseHighBrush"/>
+            <StaticResource x:Key="TeachingTipBackgroundBrush"                                                ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
+            <StaticResource x:Key="TeachingTipTitleForegroundBrush"                                           ResourceKey="SystemControlForegroundBaseHighBrush"/>
+            <StaticResource x:Key="TeachingTipSubtitleForegroundBrush"                                        ResourceKey="SystemControlForegroundBaseHighBrush"/>
             <Thickness x:Key="TeachingTipAlternateCloseButtonBorderThickness">2</Thickness>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
@@ -109,15 +97,13 @@
     <x:Double x:Key="TeachingTipAlternateCloseButtonGlyphSize">16</x:Double>
     <Thickness x:Key="TeachingTipAlternateCloseButtonPadding">5</Thickness>
     <x:String x:Key="TeachingTipAlternateCloseButtonGlyph">&#xE711;</x:String>
-    
-
+   
     <Thickness x:Key="TeachingTipContentMargin">12</Thickness>
 
     <x:Double x:Key="TeachingTipTopHighlightHeight">1</x:Double>
     <x:Double x:Key="TeachingTipBorderThickness">1</x:Double>
     <Thickness x:Key="TeachingTipTopHighlightOffsetForBorder">0,1,0,0</Thickness>
 
-
     <Style x:Key="AlternateCloseButtonStyle" TargetType="Button">
         <Setter Property="Width" Value="{ThemeResource TeachingTipAlternateCloseButtonSize}" />
         <Setter Property="Height" Value="{ThemeResource TeachingTipAlternateCloseButtonSize}" />

From 97862bf6fd4b49390c1544ba24436e98aaa147d4 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Fri, 9 Apr 2021 10:44:51 -0700
Subject: [PATCH 4/7] address PR feedback

---
 dev/TeachingTip/TeachingTip.xaml                    | 3 +--
 dev/TeachingTip/TeachingTip_rs1_themeresources.xaml | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dev/TeachingTip/TeachingTip.xaml b/dev/TeachingTip/TeachingTip.xaml
index 6610bfd591..d3cf306fa8 100755
--- a/dev/TeachingTip/TeachingTip.xaml
+++ b/dev/TeachingTip/TeachingTip.xaml
@@ -617,8 +617,7 @@
                                                 </Grid>
                                             </StackPanel>
                                         </ScrollViewer>
-                                        <Button x:Name="AlternateCloseButton"
-                                                        Style="{ThemeResource AlternateCloseButtonStyle}"/>
+                                        <Button x:Name="AlternateCloseButton" Style="{ThemeResource AlternateCloseButtonStyle}"/>
                                     </Grid>
                                 </Grid>
                                 <Grid x:Name="TopHighlightLeft"
diff --git a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
index 75672435e6..ac6c6cc9b1 100755
--- a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
+++ b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
@@ -95,7 +95,7 @@
 
     <x:Double x:Key="TeachingTipAlternateCloseButtonSize">40</x:Double>
     <x:Double x:Key="TeachingTipAlternateCloseButtonGlyphSize">16</x:Double>
-    <Thickness x:Key="TeachingTipAlternateCloseButtonPadding">5</Thickness>
+    <Thickness x:Key="TeachingTipAlternateCloseButtonPadding">4</Thickness>
     <x:String x:Key="TeachingTipAlternateCloseButtonGlyph">&#xE711;</x:String>
    
     <Thickness x:Key="TeachingTipContentMargin">12</Thickness>
@@ -164,8 +164,6 @@
                                 AutomationProperties.AccessibilityView="Raw"
                                 contract7Present:BackgroundSizing="{TemplateBinding BackgroundSizing}"
                                 Background="{TemplateBinding Background}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
                                 Foreground="{TemplateBinding Foreground}"
                                 FontFamily="{TemplateBinding FontFamily}"
                                 FontSize="{TemplateBinding FontSize}"

From 07bd144c434b7fc59e31901440930d614a808c54 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Thu, 15 Apr 2021 12:37:50 -0700
Subject: [PATCH 5/7] Remove close button resources

---
 .../TeachingTip_rs1_themeresources.xaml       | 40 ++++---------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
index ac6c6cc9b1..c4b7d69ce7 100755
--- a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
+++ b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
@@ -7,14 +7,6 @@
     xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackground"                                 ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPointerOver"                      ResourceKey="SubtleFillColorSecondaryBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPressed"                          ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundDisabled"                         ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForeground"                                 ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPointerOver"                      ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPressed"                          ResourceKey="TextFillColorSecondaryBrush"/>
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundDisabled"                         ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="TeachingTipBorderBrush"                                                    ResourceKey="SurfaceStrokeColorDefaultBrush"/>
             <SolidColorBrush x:Key="TeachingTipTopHighlightBrush"                                             Color="#0DFFFFFF"/>
             <StaticResource x:Key="TeachingTipTransientBackground"                                            ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
@@ -25,14 +17,6 @@
             <Thickness x:Key="TeachingTipAlternateCloseButtonBorderThickness">0</Thickness>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackground"                                 ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPointerOver"                      ResourceKey="SubtleFillColorSecondaryBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPressed"                          ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundDisabled"                         ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForeground"                                 ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPointerOver"                      ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPressed"                          ResourceKey="TextFillColorSecondaryBrush"/>
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundDisabled"                         ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="TeachingTipBorderBrush"                                                    ResourceKey="SurfaceStrokeColorDefaultBrush"/>
             <SolidColorBrush x:Key="TeachingTipTopHighlightBrush"                                             Color="#99FFFFFF"/>
             <StaticResource x:Key="TeachingTipTransientBackground"                                            ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
@@ -43,14 +27,6 @@
             <Thickness x:Key="TeachingTipAlternateCloseButtonBorderThickness">0</Thickness>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackground"                                 ResourceKey="SystemControlBackgroundBaseLowBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPointerOver"                      ResourceKey="SystemControlHighlightChromeHighBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundPressed"                          ResourceKey="SystemControlHighlightChromeHighBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonBackgroundDisabled"                         ResourceKey="SystemControlBackgroundBaseLowBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForeground"                                 ResourceKey="SystemControlForegroundBaseMediumBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPointerOver"                      ResourceKey="SystemControlHighlightAltBaseHighBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundPressed"                          ResourceKey="SystemControlHighlightAltBaseHighBrush" />
-            <StaticResource x:Key="TeachingTipAlternateCloseButtonForegroundDisabled"                         ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
             <StaticResource x:Key="TeachingTipBorderBrush"                                                    ResourceKey="SystemControlTransientBorderBrush"/>
             <SolidColorBrush x:Key="TeachingTipTopHighlightBrush"                                             Color="Transparent"/>
             <StaticResource x:Key="TeachingTipTransientBackground"                                            ResourceKey="SystemControlPageBackgroundChromeLowBrush"/>
@@ -107,8 +83,8 @@
     <Style x:Key="AlternateCloseButtonStyle" TargetType="Button">
         <Setter Property="Width" Value="{ThemeResource TeachingTipAlternateCloseButtonSize}" />
         <Setter Property="Height" Value="{ThemeResource TeachingTipAlternateCloseButtonSize}" />
-        <Setter Property="Background" Value="{ThemeResource TeachingTipAlternateCloseButtonBackground}" />
-        <Setter Property="Foreground" Value="{ThemeResource TeachingTipAlternateCloseButtonForeground}" />
+        <Setter Property="Background" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
         <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
         <Setter Property="FontSize" Value="{ThemeResource TeachingTipAlternateCloseButtonGlyphSize}" />
         <Setter Property="VerticalAlignment" Value="Top" />
@@ -131,30 +107,30 @@
                                 <VisualState x:Name="PointerOver">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonBackgroundPointerOver}"/>
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleFillColorSecondaryBrush}"/>
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonForegroundPointerOver}"/>
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorPrimaryBrush}"/>
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonBackgroundPressed}"/>
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleFillColorTertiaryBrush}"/>
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonForegroundPressed}"/>
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorSecondaryBrush}"/>
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonBackgroundDisabled}"/>
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleFillColorTransparentBrush}"/>
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TeachingTipAlternateCloseButtonForegroundDisabled}"/>
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorDisabledBrush}"/>
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>

From 5986d4215c9502329235190ecf01b4cb95c84ac3 Mon Sep 17 00:00:00 2001
From: Vsevolod <sevkorobot@gmail.com>
Date: Thu, 15 Apr 2021 14:37:42 -0700
Subject: [PATCH 6/7] Add borderbrush so border is visible in hc

---
 dev/TeachingTip/TeachingTip_rs1_themeresources.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
index c4b7d69ce7..76a2e59a53 100755
--- a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
+++ b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
@@ -91,6 +91,7 @@
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="Padding" Value="{ThemeResource TeachingTipAlternateCloseButtonPadding}"/>
         <Setter Property="BorderThickness" Value="{ThemeResource TeachingTipAlternateCloseButtonBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource ControlElevationBorderBrush}" />
         <Setter Property="Content" Value="{ThemeResource TeachingTipAlternateCloseButtonGlyph}"/>
         <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
         <Setter Property="FocusVisualMargin" Value="1"/>

From ac247d811c0cd9b8a594d8888d030dedfe1575ca Mon Sep 17 00:00:00 2001
From: Vsevolod <sevkorobot@gmail.com>
Date: Fri, 16 Apr 2021 10:21:21 -0700
Subject: [PATCH 7/7] Update TeachingTip_rs1_themeresources.xaml

---
 dev/TeachingTip/TeachingTip_rs1_themeresources.xaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
index fa083d5e80..5122be29e7 100755
--- a/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
+++ b/dev/TeachingTip/TeachingTip_rs1_themeresources.xaml
@@ -71,9 +71,7 @@
 
     <x:Double x:Key="TeachingTipAlternateCloseButtonSize">40</x:Double>
     <x:Double x:Key="TeachingTipAlternateCloseButtonGlyphSize">16</x:Double>
-    <Thickness x:Key="TeachingTipAlternateCloseButtonPadding">4</Thickness>
-    <x:String x:Key="TeachingTipAlternateCloseButtonGlyph">&#xE711;</x:String>
-   
+ 
     <Thickness x:Key="TeachingTipContentMargin">12</Thickness>
 
     <x:Double x:Key="TeachingTipTopHighlightHeight">1</x:Double>
@@ -89,10 +87,10 @@
         <Setter Property="FontSize" Value="{ThemeResource TeachingTipAlternateCloseButtonGlyphSize}" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="HorizontalAlignment" Value="Right" />
-        <Setter Property="Padding" Value="{ThemeResource TeachingTipAlternateCloseButtonPadding}"/>
+        <Setter Property="Padding" Value="4"/>
         <Setter Property="BorderThickness" Value="{ThemeResource TeachingTipAlternateCloseButtonBorderThickness}" />
         <Setter Property="BorderBrush" Value="{ThemeResource ControlElevationBorderBrush}" />
-        <Setter Property="Content" Value="{ThemeResource TeachingTipAlternateCloseButtonGlyph}"/>
+        <Setter Property="Content" Value="&#xE711;"/>
         <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
         <Setter Property="FocusVisualMargin" Value="1"/>
         <Setter Property="Template">