Skip to content

Commit b73afdb

Browse files
committed
Begin work on item Search, tweaks to Fluent Design
1 parent 3c29c4f commit b73afdb

12 files changed

+314
-53
lines changed

Files UWP/App.xaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
<SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="White"/>
1414
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
1515
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
16-
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f4f4f4"/>
17-
16+
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f3f1ef"/>
17+
<SolidColorBrush x:Key="YourHomeCardBorderColor" Color="#f3f1ef"/>
1818
</ResourceDictionary>
1919
<ResourceDictionary x:Key="Light">
2020
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" FallbackColor="#eaeaea" BackgroundSource="Backdrop" TintColor="LightSlateGray" TintOpacity="0.6"/>
2121
<SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="White"/>
2222
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
2323
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
24-
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f4f4f4"/>
24+
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f3f1ef"/>
25+
<SolidColorBrush x:Key="YourHomeCardBorderColor" Color="#f3f1ef"/>
2526
</ResourceDictionary>
2627
<ResourceDictionary x:Key="Dark">
2728
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="Backdrop" TintColor="Black" TintOpacity="0.6"/>
@@ -30,6 +31,7 @@
3031
<SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="#191919"/>
3132
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="Black"/>
3233
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="Black"/>
34+
<SolidColorBrush x:Key="YourHomeCardBorderColor" Color="White"/>
3335
</ResourceDictionary>
3436
<ResourceDictionary x:Key="HighContrast">
3537
<!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->

Files UWP/FilesUWP.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@
140140
<DependentUpon>Properties.xaml</DependentUpon>
141141
</Compile>
142142
<Compile Include="Properties\AssemblyInfo.cs" />
143+
<Compile Include="Search.xaml.cs">
144+
<DependentUpon>Search.xaml</DependentUpon>
145+
</Compile>
143146
<Compile Include="Settings.xaml.cs">
144147
<DependentUpon>Settings.xaml</DependentUpon>
145148
</Compile>
@@ -198,6 +201,10 @@
198201
<SubType>Designer</SubType>
199202
<Generator>MSBuild:Compile</Generator>
200203
</Page>
204+
<Page Include="Search.xaml">
205+
<SubType>Designer</SubType>
206+
<Generator>MSBuild:Compile</Generator>
207+
</Page>
201208
<Page Include="Settings.xaml">
202209
<SubType>Designer</SubType>
203210
<Generator>MSBuild:Compile</Generator>

Files UWP/GenericFileBrowser.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
mc:Ignorable="d" PointerReleased="GenericItemView_PointerReleased" Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
1717
<Page.Resources>
1818
<Style x:Key="MenuFlyoutFluentThemeResources" TargetType="MenuFlyoutPresenter">
19-
<Setter Property="CornerRadius" Value="5" />
20-
<Setter Property="Background" Value="{ThemeResource FlyoutBackgroundThemeBrush}" />
19+
<Setter Property="CornerRadius" Value="4" />
2120
</Style>
2221

2322
<Style x:Key="TextBoxStyleForPathBar" TargetType="TextBox">

Files UWP/InstanceTabsView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</Setter>
7676
</Style>
7777
<ControlTemplate x:Key="TabViewTemplate1" TargetType="Custom:TabView">
78-
<Grid Background="{ThemeResource SystemControlChromeHighAcrylicWindowMediumBrush}" x:Name="TabViewContainer">
78+
<Grid Background="{ThemeResource SystemControlAcrylicWindowMediumHighBrush}" x:Name="TabViewContainer">
7979
<Grid.ColumnDefinitions>
8080
<ColumnDefinition Width="Auto"/>
8181
<ColumnDefinition Custom:TabView.ConstrainColumn="True" Custom:TabView.IgnoreColumn="True" Width="Auto"/>

Files UWP/PhotoAlbum.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919

2020
<Page.Resources>
2121
<Style x:Key="MenuFlyoutFluentThemeResources" TargetType="MenuFlyoutPresenter">
22-
<Setter Property="CornerRadius" Value="5" />
23-
<Setter Property="Background" Value="{ThemeResource FlyoutBackgroundThemeBrush}" />
22+
<Setter Property="CornerRadius" Value="4" />
2423
</Style>
2524

2625
<Style x:Key="TextBoxStyleForPathBar" TargetType="TextBox">

0 commit comments

Comments
 (0)