|
19 | 19 | <SolidColorBrush x:Key="WindowCaptionBackground" Color="Transparent" />
|
20 | 20 | <SolidColorBrush x:Key="WindowCaptionBackgroundDisabled" Color="Transparent" />
|
21 | 21 |
|
| 22 | + <!-- Removes NavigationView background --> |
| 23 | + <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" /> |
| 24 | + |
| 25 | + <!-- Removes NavigationView corner radius --> |
| 26 | + <CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius> |
| 27 | + |
| 28 | + <!-- Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/5441 --> |
| 29 | + <x:Double x:Key="MediaTransportControlsMinWidth">50</x:Double> |
| 30 | + |
| 31 | + <!-- Workaround for an issue where the shadow was showing on the tab control --> |
| 32 | + <x:Double x:Key="TabViewShadowDepth">0</x:Double> |
| 33 | + |
| 34 | + <CornerRadius x:Key="GridViewThumbnailCornerRadius">2</CornerRadius> |
| 35 | + <CornerRadius x:Key="DetailsLayoutThumbnailCornerRadius">2</CornerRadius> |
| 36 | + |
| 37 | + <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3"> |
| 38 | + <LinearGradientBrush.RelativeTransform> |
| 39 | + <ScaleTransform CenterY="0.5" ScaleY="-1" /> |
| 40 | + </LinearGradientBrush.RelativeTransform> |
| 41 | + <LinearGradientBrush.GradientStops> |
| 42 | + <GradientStop Offset="0" Color="{ThemeResource ControlStrokeColorSecondary}" /> |
| 43 | + <GradientStop Offset="1.0" Color="{ThemeResource ControlStrokeColorDefault}" /> |
| 44 | + </LinearGradientBrush.GradientStops> |
| 45 | + </LinearGradientBrush> |
| 46 | + |
22 | 47 | <ResourceDictionary.MergedDictionaries>
|
23 | 48 | <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
|
24 | 49 | <ResourceDictionary>
|
25 | 50 | <ResourceDictionary.ThemeDictionaries>
|
26 | 51 | <ResourceDictionary x:Key="Light">
|
| 52 | + <SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" /> |
| 53 | + <SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" /> |
| 54 | + <SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" /> |
| 55 | + <SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" /> |
| 56 | + |
27 | 57 | <SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
|
28 | 58 | <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
|
29 | 59 | <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
|
30 | 60 | <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
|
31 |
| - <SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource DividerStrokeColorDefault}" /> |
32 |
| - <SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" /> |
33 |
| - <SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" /> |
34 |
| - <SolidColorBrush x:Key="AddressToolbarBackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" /> |
35 |
| - <SolidColorBrush x:Key="FileBrowserHeaderBackgroundBrush" Color="Transparent" /> |
36 |
| - <SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" /> |
37 |
| - <StaticResource x:Key="SidebarContentBackgroundBrush" ResourceKey="CardBackgroundFillColorDefault" /> |
38 |
| - <SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="Transparent" /> |
39 |
| - <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" /> |
40 | 61 | </ResourceDictionary>
|
41 | 62 | <ResourceDictionary x:Key="Dark">
|
| 63 | + <SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" /> |
| 64 | + <SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" /> |
| 65 | + <SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="#993A3A3A" /> |
| 66 | + <SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="#993A3A3A" /> |
| 67 | + |
42 | 68 | <SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
|
43 | 69 | <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
|
44 | 70 | <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
|
45 | 71 | <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
|
46 |
| - <SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource DividerStrokeColorDefault}" /> |
47 |
| - <SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" /> |
48 |
| - <SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" /> |
49 |
| - <SolidColorBrush x:Key="AddressToolbarBackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" /> |
50 |
| - <SolidColorBrush x:Key="FileBrowserHeaderBackgroundBrush" Color="Transparent" /> |
51 |
| - <SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" /> |
52 |
| - <SolidColorBrush x:Key="SidebarContentBackgroundBrush" Color="#993A3A3A" /> |
53 |
| - <SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="Transparent" /> |
54 |
| - <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" /> |
55 | 72 | </ResourceDictionary>
|
56 | 73 | <ResourceDictionary x:Key="HighContrast">
|
| 74 | + <SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" /> |
| 75 | + <SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="Transparent" /> |
| 76 | + <SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" /> |
| 77 | + <SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" /> |
| 78 | + |
57 | 79 | <SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SystemColorWindowColor}" />
|
58 | 80 | <SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerFillColorDefault}" />
|
59 | 81 | <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SystemColorHighlightColor}" />
|
60 | 82 | <SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
|
61 |
| - <SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource SystemColorGrayTextColor}" /> |
62 |
| - <SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" /> |
63 |
| - <SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" /> |
64 |
| - <SolidColorBrush x:Key="AddressToolbarBackgroundBrush" Color="Transparent" /> |
65 |
| - <StaticResource x:Key="FileBrowserHeaderBackgroundBrush" ResourceKey="SolidBackgroundFillColorBaseBrush" /> |
66 |
| - <SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" /> |
67 |
| - <StaticResource x:Key="SidebarContentBackgroundBrush" ResourceKey="CardBackgroundFillColorDefault" /> |
68 |
| - <SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="Transparent" /> |
69 |
| - <SolidColorBrush x:Key="NavigationViewContentBackground" Color="#0F000000" /> |
70 | 83 | </ResourceDictionary>
|
71 | 84 | </ResourceDictionary.ThemeDictionaries>
|
72 |
| - <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3"> |
73 |
| - <LinearGradientBrush.RelativeTransform> |
74 |
| - <ScaleTransform CenterY="0.5" ScaleY="-1" /> |
75 |
| - </LinearGradientBrush.RelativeTransform> |
76 |
| - <LinearGradientBrush.GradientStops> |
77 |
| - <GradientStop Offset="0" Color="{ThemeResource ControlStrokeColorSecondary}" /> |
78 |
| - <GradientStop Offset="1.0" Color="{ThemeResource ControlStrokeColorDefault}" /> |
79 |
| - </LinearGradientBrush.GradientStops> |
80 |
| - </LinearGradientBrush> |
81 |
| - |
82 |
| - <CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius> |
83 |
| - <CornerRadius x:Key="GridViewThumbnailCornerRadius">2</CornerRadius> |
84 |
| - <CornerRadius x:Key="DetailsLayoutThumbnailCornerRadius">2</CornerRadius> |
85 |
| - |
86 |
| - <!-- Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/5441 --> |
87 |
| - <x:Double x:Key="MediaTransportControlsMinWidth">50</x:Double> |
88 |
| - |
89 |
| - <!-- Workaround for an issue where the shadow was showing on the tab control --> |
90 |
| - <x:Double x:Key="TabViewShadowDepth">0</x:Double> |
91 | 85 | </ResourceDictionary>
|
92 | 86 | </ResourceDictionary.MergedDictionaries>
|
93 | 87 | </ResourceDictionary>
|
|
0 commit comments