chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove MergedDictionaries from All Styles

Browse Source
This commit is contained in:
Mahdi Hosseini committed 2021-07-04 11:50:47 +04:30
1 parent 77f4d0199e
commit d2642566f0
138 files changed
+230 -1033
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml
+2 -8
View File
@@ -1,11 +1,5 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:themes="clr-namespace:HandyControl.Themes">
<ResourceDictionary.MergedDictionaries>
<themes:SharedResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Styles/Base/BaseStyle.xaml"/>
<themes:SharedResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Basic/Sizes.xaml"/>
</ResourceDictionary.MergedDictionaries>
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="ButtonBaseBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ButtonBase">
<Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
@@ -19,4 +13,4 @@
<Setter Property="VerticalContentAlignment" Value="Center"/>
</Style>
</ResourceDictionary>
</ResourceDictionary>