mirror of
https://gitcode.com/gh_mirrors/se/Semi.Avalonia
synced 2026-05-03 22:41:29 +08:00
misc: rearrange demo theme resources.
This commit is contained in:
@@ -7,8 +7,15 @@
|
|||||||
<!-- You can still reference in old way. -->
|
<!-- You can still reference in old way. -->
|
||||||
<!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
|
<!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
|
||||||
<semi:SemiTheme Locale="zh-CN" />
|
<semi:SemiTheme Locale="zh-CN" />
|
||||||
<semi:SemiPopupAnimations/>
|
<semi:SemiPopupAnimations />
|
||||||
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
|
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
|
||||||
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
|
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
|
||||||
</Application.Styles>
|
</Application.Styles>
|
||||||
|
<Application.Resources>
|
||||||
|
<ResourceDictionary>
|
||||||
|
<ResourceDictionary.MergedDictionaries>
|
||||||
|
<ResourceInclude Source="Themes/_index.axaml" />
|
||||||
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
</ResourceDictionary>
|
||||||
|
</Application.Resources>
|
||||||
</Application>
|
</Application>
|
||||||
@@ -11,15 +11,6 @@
|
|||||||
<Design.DataContext>
|
<Design.DataContext>
|
||||||
<vm:HighContrastDemoViewModel />
|
<vm:HighContrastDemoViewModel />
|
||||||
</Design.DataContext>
|
</Design.DataContext>
|
||||||
<UserControl.Resources>
|
|
||||||
<ResourceDictionary>
|
|
||||||
<ResourceDictionary.MergedDictionaries>
|
|
||||||
<ResourceInclude Source="../Themes/ToggleSwitch.axaml" />
|
|
||||||
<ResourceInclude Source="../Controls/ColorItemControl.axaml" />
|
|
||||||
<ResourceInclude Source="../Controls/ColorDetailControl.axaml" />
|
|
||||||
</ResourceDictionary.MergedDictionaries>
|
|
||||||
</ResourceDictionary>
|
|
||||||
</UserControl.Resources>
|
|
||||||
<SplitView
|
<SplitView
|
||||||
Name="splitView"
|
Name="splitView"
|
||||||
CompactPaneLength="50"
|
CompactPaneLength="50"
|
||||||
|
|||||||
@@ -14,17 +14,6 @@
|
|||||||
<Design.DataContext>
|
<Design.DataContext>
|
||||||
<viewModels:PaletteDemoViewModel />
|
<viewModels:PaletteDemoViewModel />
|
||||||
</Design.DataContext>
|
</Design.DataContext>
|
||||||
<UserControl.Resources>
|
|
||||||
<ResourceDictionary>
|
|
||||||
<ResourceDictionary.MergedDictionaries>
|
|
||||||
<ResourceInclude Source="../Themes/ToggleSwitch.axaml" />
|
|
||||||
<ResourceInclude Source="../Controls/ColorItemControl.axaml" />
|
|
||||||
<ResourceInclude Source="../Controls/ColorDetailControl.axaml" />
|
|
||||||
<ResourceInclude Source="../Controls/FunctionalColorGroupControl.axaml" />
|
|
||||||
<ResourceInclude Source="../Controls/ShadowGroupControl.axaml" />
|
|
||||||
</ResourceDictionary.MergedDictionaries>
|
|
||||||
</ResourceDictionary>
|
|
||||||
</UserControl.Resources>
|
|
||||||
<SplitView
|
<SplitView
|
||||||
Name="splitView"
|
Name="splitView"
|
||||||
CompactPaneLength="50"
|
CompactPaneLength="50"
|
||||||
|
|||||||
10
demo/Semi.Avalonia.Demo/Themes/_index.axaml
Normal file
10
demo/Semi.Avalonia.Demo/Themes/_index.axaml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
|
<ResourceDictionary.MergedDictionaries>
|
||||||
|
<ResourceInclude Source="ColorDetailControl.axaml" />
|
||||||
|
<ResourceInclude Source="ColorItemControl.axaml" />
|
||||||
|
<ResourceInclude Source="FunctionalColorGroupControl.axaml" />
|
||||||
|
<ResourceInclude Source="ShadowGroupControl.axaml" />
|
||||||
|
<ResourceInclude Source="TabMenu.axaml" />
|
||||||
|
<ResourceInclude Source="ToggleSwitch.axaml" />
|
||||||
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
</ResourceDictionary>
|
||||||
@@ -11,14 +11,6 @@
|
|||||||
x:CompileBindings="True"
|
x:CompileBindings="True"
|
||||||
x:DataType="views:MainViewModel"
|
x:DataType="views:MainViewModel"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<UserControl.Resources>
|
|
||||||
<ResourceDictionary>
|
|
||||||
<ResourceDictionary.MergedDictionaries>
|
|
||||||
<ResourceInclude Source="../Themes/TabMenu.axaml" />
|
|
||||||
<ResourceInclude Source="../Themes/ToggleSwitch.axaml" />
|
|
||||||
</ResourceDictionary.MergedDictionaries>
|
|
||||||
</ResourceDictionary>
|
|
||||||
</UserControl.Resources>
|
|
||||||
<Grid RowDefinitions="Auto, *">
|
<Grid RowDefinitions="Auto, *">
|
||||||
<Border
|
<Border
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
|
|||||||
Reference in New Issue
Block a user