Begin work on item Search, tweaks to Fluent Design

files-community · Jun 4, 2019 · b73afdb · b73afdb
1 parent 3c29c4f
commit b73afdb
Show file tree

Hide file tree

Showing 12 changed files with 314 additions and 53 deletions.
diff --git a/Files UWP/App.xaml b/Files UWP/App.xaml
@@ -13,15 +13,16 @@
                             <SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="White"/>
                             <AcrylicBrush x:Key="NavigationViewExpandedPaneBackground"  BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
                             <SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
-                            <SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f4f4f4"/>
-
+                            <SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f3f1ef"/>
+                            <SolidColorBrush x:Key="YourHomeCardBorderColor" Color="#f3f1ef"/>
                         </ResourceDictionary>
                         <ResourceDictionary x:Key="Light">
                             <AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" FallbackColor="#eaeaea" BackgroundSource="Backdrop" TintColor="LightSlateGray" TintOpacity="0.6"/>
                             <SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="White"/>
                             <AcrylicBrush x:Key="NavigationViewExpandedPaneBackground"  BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
                             <SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
-                            <SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f4f4f4"/>
+                            <SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f3f1ef"/>
+                            <SolidColorBrush x:Key="YourHomeCardBorderColor" Color="#f3f1ef"/>
                         </ResourceDictionary>
                         <ResourceDictionary x:Key="Dark">
                             <AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="Backdrop" TintColor="Black" TintOpacity="0.6"/>
@@ -30,6 +31,7 @@
                             <SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="#191919"/>
                             <SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="Black"/>
                             <SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="Black"/>
+                            <SolidColorBrush x:Key="YourHomeCardBorderColor" Color="White"/>
                         </ResourceDictionary>
                         <ResourceDictionary x:Key="HighContrast">
                             <!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->

diff --git a/Files UWP/FilesUWP.csproj b/Files UWP/FilesUWP.csproj
@@ -140,6 +140,9 @@
       <DependentUpon>Properties.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Search.xaml.cs">
+      <DependentUpon>Search.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Settings.xaml.cs">
       <DependentUpon>Settings.xaml</DependentUpon>
     </Compile>
@@ -198,6 +201,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Search.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Settings.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/Files UWP/GenericFileBrowser.xaml b/Files UWP/GenericFileBrowser.xaml
@@ -16,8 +16,7 @@
     mc:Ignorable="d" PointerReleased="GenericItemView_PointerReleased" Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
     <Page.Resources>
         <Style x:Key="MenuFlyoutFluentThemeResources" TargetType="MenuFlyoutPresenter">
-            <Setter Property="CornerRadius" Value="5" />
-            <Setter Property="Background" Value="{ThemeResource FlyoutBackgroundThemeBrush}" />
+            <Setter Property="CornerRadius" Value="4" />
         </Style>
 
         <Style x:Key="TextBoxStyleForPathBar" TargetType="TextBox">

diff --git a/Files UWP/InstanceTabsView.xaml b/Files UWP/InstanceTabsView.xaml
@@ -75,7 +75,7 @@
                 </Setter>
             </Style>
             <ControlTemplate x:Key="TabViewTemplate1" TargetType="Custom:TabView">
-                <Grid Background="{ThemeResource SystemControlChromeHighAcrylicWindowMediumBrush}" x:Name="TabViewContainer">
+                <Grid Background="{ThemeResource SystemControlAcrylicWindowMediumHighBrush}" x:Name="TabViewContainer">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Custom:TabView.ConstrainColumn="True" Custom:TabView.IgnoreColumn="True" Width="Auto"/>

diff --git a/Files UWP/PhotoAlbum.xaml b/Files UWP/PhotoAlbum.xaml
@@ -19,8 +19,7 @@
 
     <Page.Resources>
         <Style x:Key="MenuFlyoutFluentThemeResources" TargetType="MenuFlyoutPresenter">
-            <Setter Property="CornerRadius" Value="5" />
-            <Setter Property="Background" Value="{ThemeResource FlyoutBackgroundThemeBrush}" />
+            <Setter Property="CornerRadius" Value="4" />
         </Style>
 
         <Style x:Key="TextBoxStyleForPathBar" TargetType="TextBox">