merge with master

2019-12-02 19:36:54 -08:00
parent 39885668ae
commit 73d6a32add
247 changed files with 27860 additions and 8218 deletions
--- a/src/Calculator/Views/NumberPad.xaml
+++ b/src/Calculator/Views/NumberPad.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="CalculatorApp.NumberPad"
+<UserControl x:Class="CalculatorApp.NumberPad"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:common="using:CalculatorApp.Common"
@@ -112,7 +112,6 @@
                                   Grid.Row="3"
                                   Grid.Column="2"
                                   Style="{Binding ElementName=ControlRoot, Path=ButtonStyle}"
-                                   Background="{ThemeResource AppBackgroundAltMediumLowBrush}"
                                   common:KeyboardShortcutManager.Character="."
                                   AutomationProperties.AutomationId="decimalSeparatorButton"
                                   ButtonId="Decimal"