From ef8bdb113c015201deaef6fa8ab003351afccf79 Mon Sep 17 00:00:00 2001
From: UXP Controls Automated Porting System <uxpc@microsoft.com>
Date: Tue, 15 Jan 2019 15:50:59 -0800
Subject: [PATCH] Fix search button style to match rest of buttons in nav view

---
 dev/NavigationView/NavigationView.xaml                    | 2 +-
 dev/NavigationView/NavigationView_rs1_themeresources.xaml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml
index 7ac677dc1d..ead5e751de 100644
--- a/dev/NavigationView/NavigationView.xaml
+++ b/dev/NavigationView/NavigationView.xaml
@@ -354,7 +354,7 @@
 
                                         <Grid Grid.Row="2" Height="{StaticResource PaneToggleButtonHeight}">
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="40"/> <!-- TODO: How to best get from Double 'PaneToggleButtonWidth' to GridLength in markup? -->
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
 
diff --git a/dev/NavigationView/NavigationView_rs1_themeresources.xaml b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
index 30df524162..599321351c 100644
--- a/dev/NavigationView/NavigationView_rs1_themeresources.xaml
+++ b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
@@ -317,6 +317,8 @@
         <Setter Property="Content" Value="&#xE11A;"/>
         <Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
         <Setter Property="BorderThickness" Value="{ThemeResource NavigationViewToggleBorderThickness}" />
+        <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
     </Style>
 
     <Style x:Key="NavigationViewOverflowButtonStyleWhenPaneOnTop" TargetType="Button">