mirror of
https://github.com/proxysu/ProxySU.git
synced 2024-11-21 20:56:08 +03:00
merge
This commit is contained in:
parent
4d9890c797
commit
1e96735db6
@ -8,10 +8,10 @@
|
|||||||
<Application.Resources>
|
<Application.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
<!--Languages-->
|
<!--Language-->
|
||||||
<ResourceDictionary Source="/Resources/Languages/zh_cn.xaml" />
|
<ResourceDictionary Source="/Resources/Languages/zh_cn.xaml" />
|
||||||
|
|
||||||
<!--styles-->
|
<!--style-->
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
<Style TargetType="{x:Type TextBox}">
|
<Style TargetType="{x:Type TextBox}">
|
||||||
<Setter Property="Padding" Value="5,2" />
|
<Setter Property="Padding" Value="5,2" />
|
||||||
@ -24,7 +24,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|
||||||
<!--components styles-->
|
<!--component style-->
|
||||||
<ResourceDictionary Source="/Resources/Styles/DataGridStyle.xaml" />
|
<ResourceDictionary Source="/Resources/Styles/DataGridStyle.xaml" />
|
||||||
|
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
Loading…
Reference in New Issue
Block a user