Skip to content

Commit 5cb064e

Browse files
authored
Code Quality: Renamed SideBar to Sidebar & renamed styles to keep consisntecy (#15744)
1 parent e5ba470 commit 5cb064e

26 files changed

+14
-31
lines changed

src/Files.App/App.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838

3939
<!-- Styles for the custom icons -->
4040
<ResourceDictionary Source="ms-appx:///Styles/PathIcons.xaml" />
41-
<ResourceDictionary Source="ms-appx:///UserControls/SideBar/SideBarControls.xaml" />
42-
<ResourceDictionary Source="ms-appx:///Styles/App.Theme.TextBlockStyles.xaml" />
41+
<ResourceDictionary Source="ms-appx:///Styles/SideBarStyles.xaml" />
42+
<ResourceDictionary Source="ms-appx:///Styles/TextBlockStyles.xaml" />
4343
<ResourceDictionary Source="ms-appx:///Styles/ShimmerStyles.xaml" />
4444
<ResourceDictionary Source="ms-appx:///Styles/MenuFlyoutSubItemWithImageStyle.xaml" />
4545
<ResourceDictionary>

src/Files.App/UserControls/SideBar/SideBarControls.xaml renamed to src/Files.App/Styles/SidebarStyles.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
2-
<!-- Licensed under the MIT License. -->
3-
1+
<!-- Copyright (c) 2024 Files Community. Licensed under the MIT License. See the LICENSE. -->
42
<ResourceDictionary
5-
x:Class="Files.App.UserControls.Sidebar.SidebarResources"
63
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
74
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
85
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"

src/Files.App/UserControls/InnerNavigationToolbar.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ResourceDictionary>
1818
<ResourceDictionary.MergedDictionaries>
1919
<ResourceDictionary Source="ms-appx:///Styles/ToolbarButtonStyle.xaml" />
20-
<ResourceDictionary Source="ms-appx:///Styles/RightAlignedToggleSwitchStyle.xaml" />
20+
<ResourceDictionary Source="ms-appx:///Styles/ToggleSwitchStyles.xaml" />
2121
</ResourceDictionary.MergedDictionaries>
2222

2323
<SolidColorBrush x:Key="CommandBarBackground" Color="Transparent" />

src/Files.App/UserControls/SideBar/SideBarResources.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)