更新整理
This commit is contained in:
@@ -1,11 +1,4 @@
|
||||
<!--
|
||||
This Source Code Form is subject to the terms of the MIT License.
|
||||
If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
|
||||
Copyright (C) Leszek Pomianowski and WPF UI Contributors.
|
||||
All Rights Reserved.
|
||||
-->
|
||||
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
|
||||
<!-- Colors depending on the theme should be changed by the Manager -->
|
||||
<Color x:Key="SystemAccentColor">#3379d9</Color>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/Theme/Light.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/Variables.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Themes/Light.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/Variables.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
</ResourceDictionary>
|
||||
@@ -1,13 +1,4 @@
|
||||
<!--
|
||||
This Source Code Form is subject to the terms of the MIT License.
|
||||
If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
|
||||
Copyright (C) Leszek Pomianowski and WPF UI Contributors.
|
||||
All Rights Reserved.
|
||||
|
||||
Based on Microsoft XAML for Win UI
|
||||
Copyright (c) Microsoft Corporation. All Rights Reserved.
|
||||
-->
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
|
||||
<FontFamily x:Key="ContentControlThemeFontFamily">Segoe Ui</FontFamily>
|
||||
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
<!--
|
||||
This Source Code Form is subject to the terms of the MIT License.
|
||||
If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
|
||||
Copyright (C) Leszek Pomianowski and WPF UI Contributors.
|
||||
All Rights Reserved.
|
||||
<!--
|
||||
用于设置特殊情况下的颜色
|
||||
-->
|
||||
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
-->
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<!--Resources-->
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/Variables.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/Fonts.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/Typography.xaml" />
|
||||
@@ -15,7 +16,7 @@
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/DefaultContextMenu.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/DefaultFocusVisualStyle.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/DefaultTextBoxScrollViewerStyle.xaml" />
|
||||
|
||||
<!--Controls-->
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/FontIcon/FontIconFallback.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Button/Button.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/AccessText/AccessText.xaml" />
|
||||
@@ -48,6 +49,7 @@
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Scroll/DynamicScrollViewer.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Expander/Expander.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/FluentWindow/FluentWindow.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/FluentWindowEx/FluentWindowEx.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Flyout/Flyout.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Frame/Frame.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/GridView/GridViewColumnHeader.xaml" />
|
||||
@@ -109,6 +111,5 @@
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/VirtualizingPanel/VirtualizingItemsControl.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/VirtualizingPanel/VirtualizingWrapPanel.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Window/Window.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/FluentWindowEx/FluentWindowEx.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
</ResourceDictionary>
|
||||
@@ -10,7 +10,7 @@
|
||||
<ResourceDictionary
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:system="clr-namespace:System;assembly=System.Runtime">
|
||||
xmlns:system="clr-namespace:System;assembly=mscorlib">
|
||||
|
||||
<system:Double x:Key="DefaultIconFontSize">16</system:Double>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user