Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed extra resources #8143

Merged
merged 3 commits into from
Feb 15, 2022
Merged

Removed extra resources #8143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b81f7d
Fixed nav toolbar corner radius
yaira2 Feb 3, 2022
ce53d49
Removed extra resources
yaira2 Feb 3, 2022
c230f8f
Merge branch 'main' into CornerRadius
yaira2 Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 3 additions & 39 deletions src/Files/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,90 +31,54 @@
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
<Color x:Key="SolidBackgroundAcrylic">#FFFFFF</Color>
<!-- Corner Radius -->
<CornerRadius x:Key="NavToolbarCornerRadius">0,0,0,8</CornerRadius>
<!-- Tabs -->
<CornerRadius x:Key="NavToolbarCornerRadius">0</CornerRadius>
<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource ControlFillColorDefault}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource DividerStrokeColorDefault}" />
<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
<!-- Navigation Toolbar -->
<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="#00000000" />
<SolidColorBrush x:Key="NavigationToolbarBreadcrumbBackgroundBrush" Color="Transparent" />
<!-- Horizontal Tab Control -->
<SolidColorBrush x:Key="HorizontalTabControlBackgroundBrush" Color="Transparent" />
<!-- File Browser Control -->
<SolidColorBrush x:Key="FileBrowserHeaderBackgroundBrush" Color="Transparent" />

<SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" />

<StaticResource x:Key="SidebarContentBackgroundBrush" ResourceKey="LayerFillColorDefaultBrush" />
<SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<Color x:Key="SolidBackgroundAcrylic">#2C2C2C</Color>
<!-- Corner Radius -->
<CornerRadius x:Key="NavToolbarCornerRadius">0,0,0,8</CornerRadius>

<!-- Tabs -->
<CornerRadius x:Key="NavToolbarCornerRadius">0</CornerRadius>
<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource ControlFillColorDefault}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource DividerStrokeColorDefault}" />
<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
<!-- Navigation Toolbar -->
<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="#00000000" />
<SolidColorBrush x:Key="NavigationToolbarBreadcrumbBackgroundBrush" Color="Transparent" />
<!-- Horizontal Tab Control -->
<SolidColorBrush x:Key="HorizontalTabControlBackgroundBrush" Color="Transparent" />
<!-- File Browser Control -->
<SolidColorBrush x:Key="FileBrowserHeaderBackgroundBrush" Color="Transparent" />

<SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" />

<StaticResource x:Key="SidebarContentBackgroundBrush" ResourceKey="LayerFillColorDefaultBrush" />
<SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
<SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="{StaticResource SystemColorWindowColor}" />
<StaticResource x:Key="SolidBackgroundFillColorBase" ResourceKey="SystemColorWindowColor" />
<StaticResource x:Key="SolidBackgroundFillColorSecondary" ResourceKey="SystemColorWindowColor" />
<StaticResource x:Key="SolidBackgroundFillColorTertiary" ResourceKey="SystemColorWindowColor" />
<StaticResource x:Key="SolidBackgroundFillColorQuarternary" ResourceKey="SystemColorWindowColor" />
<StaticResource x:Key="ControlStrokeColorDefault" ResourceKey="SystemColorWindowTextColor" />
<StaticResource x:Key="ControlStrokeColorSecondary" ResourceKey="SystemColorWindowTextColor" />
<SolidColorBrush x:Key="SolidBackgroundFillColorBaseBrush" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{StaticResource SystemColorWindowColor}" />
<Color x:Key="SolidBackgroundAcrylic">#2C2C2C</Color>
<!-- Corner Radius -->
<CornerRadius x:Key="NavToolbarCornerRadius">0,0,0,8</CornerRadius>
<!-- Tabs -->
<CornerRadius x:Key="NavToolbarCornerRadius">0</CornerRadius>
<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource SystemColorGrayTextColor}" />
<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
<!-- Navigation Toolbar -->
<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="NavigationToolbarBreadcrumbBackgroundBrush" Color="Transparent" />
<!-- Horizontal Tab Control -->
<SolidColorBrush x:Key="HorizontalTabControlBackgroundBrush" Color="Transparent" />
<!-- File Browser Control -->
<StaticResource x:Key="FileBrowserHeaderBackgroundBrush" ResourceKey="SolidBackgroundFillColorBaseBrush" />

<SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" />

<StaticResource x:Key="SidebarContentBackgroundBrush" ResourceKey="LayerFillColorDefaultBrush" />
<SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="#0F000000" />
Expand Down
12 changes: 0 additions & 12 deletions src/Files/Themes/Acrylic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.65" />
<AcrylicBrush
x:Key="HorizontalTabControlBackgroundBrush"
BackgroundSource="HostBackdrop"
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.65" />
<AcrylicBrush
x:Key="TabViewItemHeaderBackground"
BackgroundSource="HostBackdrop"
Expand Down Expand Up @@ -111,12 +105,6 @@
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.65" />
<AcrylicBrush
x:Key="HorizontalTabControlBackgroundBrush"
BackgroundSource="HostBackdrop"
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.65" />
<AcrylicBrush
x:Key="TabViewItemHeaderBackground"
BackgroundSource="HostBackdrop"
Expand Down
12 changes: 0 additions & 12 deletions src/Files/Themes/Blue Acrylic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.75" />
<AcrylicBrush
x:Key="HorizontalTabControlBackgroundBrush"
BackgroundSource="HostBackdrop"
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.75" />
<AcrylicBrush
x:Key="TabContainerFillColorPrimary"
BackgroundSource="HostBackdrop"
Expand Down Expand Up @@ -96,12 +90,6 @@
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.75" />
<AcrylicBrush
x:Key="HorizontalTabControlBackgroundBrush"
BackgroundSource="HostBackdrop"
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.75" />
<AcrylicBrush
x:Key="TabContainerFillColorPrimary"
BackgroundSource="HostBackdrop"
Expand Down
12 changes: 0 additions & 12 deletions src/Files/Themes/Glass.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@
FallbackColor="{ThemeResource SolidBackgroundFillColorBase}"
TintColor="{ThemeResource SolidBackgroundFillColorBase}"
TintOpacity="0.5" />
<AcrylicBrush
x:Key="HorizontalTabControlBackgroundBrush"
BackgroundSource="HostBackdrop"
FallbackColor="{ThemeResource SolidBackgroundFillColorBase}"
TintColor="{ThemeResource SolidBackgroundFillColorBase}"
TintOpacity="0.5" />

<!-- Tabs -->
<AcrylicBrush
Expand Down Expand Up @@ -119,12 +113,6 @@
TintOpacity="0.4" />

<!-- Tabs Area Background -->
<AcrylicBrush
x:Key="HorizontalTabControlBackgroundBrush"
BackgroundSource="HostBackdrop"
FallbackColor="{ThemeResource SolidBackgroundFillColorBase}"
TintColor="{ThemeResource SolidBackgroundFillColorBase}"
TintOpacity="0.4" />
<AcrylicBrush
x:Key="RootBackgroundBrush"
BackgroundSource="HostBackdrop"
Expand Down
12 changes: 0 additions & 12 deletions src/Files/Themes/Mica Imitation.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.95" />
<AcrylicBrush
x:Key="HorizontalTabControlBackgroundBrush"
BackgroundSource="HostBackdrop"
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.95" />

<!-- Tabs -->
<AcrylicBrush
Expand Down Expand Up @@ -119,12 +113,6 @@
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.95" />
<AcrylicBrush
x:Key="HorizontalTabControlBackgroundBrush"
BackgroundSource="HostBackdrop"
FallbackColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintColor="{ThemeResource SolidBackgroundFillColorSecondary}"
TintOpacity="0.95" />

<!-- Tabs -->
<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="transparent" />
Expand Down
2 changes: 1 addition & 1 deletion src/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
</ResourceDictionary>
</UserControl.Resources>

<Grid HorizontalAlignment="Stretch" Background="{ThemeResource HorizontalTabControlBackgroundBrush}">
<Grid HorizontalAlignment="Stretch" Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
Expand Down
21 changes: 0 additions & 21 deletions src/Files/Views/SettingsPages/Appearance.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@
<!-- Navigation Toolbar -->
<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="#00000000" />
<SolidColorBrush x:Key="NavigationToolbarBreadcrumbBackgroundBrush" Color="Transparent" />
<!-- Horizontal Tab Control -->
<SolidColorBrush x:Key="HorizontalTabControlBackgroundBrush" Color="Transparent" />
<!-- File Browser Control -->
<SolidColorBrush x:Key="FileBrowserHeaderBackgroundBrush" Color="Transparent" />

<SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="#113A3A3A" />

<Color x:Key="LayerFillColorDefault">#11000000</Color>
</ResourceDictionary>
<ResourceDictionary x:Key="Default">
Expand All @@ -58,13 +51,6 @@
<!-- Navigation Toolbar -->
<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="#00000000" />
<SolidColorBrush x:Key="NavigationToolbarBreadcrumbBackgroundBrush" Color="Transparent" />
<!-- Horizontal Tab Control -->
<SolidColorBrush x:Key="HorizontalTabControlBackgroundBrush" Color="Transparent" />
<!-- File Browser Control -->
<SolidColorBrush x:Key="FileBrowserHeaderBackgroundBrush" Color="Transparent" />

<SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="#3C3A3A3A" />

<Color x:Key="LayerFillColorDefault">#11000000</Color>
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
Expand Down Expand Up @@ -93,13 +79,6 @@
<!-- Navigation Toolbar -->
<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="NavigationToolbarBreadcrumbBackgroundBrush" Color="Transparent" />
<!-- Horizontal Tab Control -->
<SolidColorBrush x:Key="HorizontalTabControlBackgroundBrush" Color="Transparent" />
<!-- File Browser Control -->
<StaticResource x:Key="FileBrowserHeaderBackgroundBrush" ResourceKey="SolidBackgroundFillColorBaseBrush" />

<SolidColorBrush x:Key="TitlebarContentBackgroundBrush" Color="#3C3A3A3A" />

<Color x:Key="LayerFillColorDefault">#11000000</Color>
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
Expand Down