Skip to content

Commit

Permalink
Styles -> Controls
Browse files Browse the repository at this point in the history
  • Loading branch information
@NotYoojun
NotYoojun committed Jul 19, 2024
1 parent 3443abc commit 50ec7c1
Show file tree
Hide file tree
Showing 54 changed files with 54 additions and 54 deletions.
4 changes: 2 additions & 2 deletions source/iNKORE.UI.WPF.Modern.Controls/Controls/MediaPlayerElement/MediaTransportControls.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Slider.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/TextStyles.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Slider.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/TextStyles.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/CommandBar/AppBarButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/CommandBar/AppBarRepeatButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/CommandBar/AppBarToggleButton.xaml" />
Expand Down
2 changes: 1 addition & 1 deletion source/iNKORE.UI.WPF.Modern.Controls/Controls/MenuFlyout/MenuFlyout.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ContextMenu.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ContextMenu.xaml" />
</ResourceDictionary.MergedDictionaries>

<Style BasedOn="{StaticResource ContextMenuStyleBase}" TargetType="local:MenuFlyoutPresenter">
Expand Down
2 changes: 1 addition & 1 deletion source/iNKORE.UI.WPF.Modern.Controls/Controls/NavigationView/NavigationView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Button.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Button.xaml" />
<ResourceDictionary>
<ui:BindingProxy x:Key="OverlayCornerRadiusProxy" Value="{DynamicResource OverlayCornerRadius}" />
<ikw:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
Expand Down
4 changes: 2 additions & 2 deletions source/iNKORE.UI.WPF.Modern.Controls/Controls/NumberBox/NumberBox.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/RepeatButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/TextBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/RepeatButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/TextBox.xaml" />
</ResourceDictionary.MergedDictionaries>

<ikw:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
Expand Down
2 changes: 1 addition & 1 deletion source/iNKORE.UI.WPF.Modern.Controls/Controls/SplitButton/SplitButton.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Button.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Button.xaml" />
</ResourceDictionary.MergedDictionaries>

<sys:Double x:Key="SplitButtonPrimaryButtonSize">32</sys:Double>
Expand Down
4 changes: 2 additions & 2 deletions source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/CompactSizingPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
<local:ControlExample.Xaml>
<sys:String xml:space="preserve">
&lt;Page.Resources&gt;
&lt;ResourceDictionary Source=&quot;pack://application:,,,/iNKORE.UI.WPF.Modern;component/Density/iNKORE.UI.WPF.Modern;component/Themes/Styles/Compact.xaml&quot; /&gt;
&lt;ResourceDictionary Source=&quot;pack://application:,,,/iNKORE.UI.WPF.Modern;component/Density/iNKORE.UI.WPF.Modern;component/Themes/Controls/Compact.xaml&quot; /&gt;
&lt;/Page.Resources&gt;

&lt;Grid.Resources&gt;
&lt;ResourceDictionary Source=&quot;pack://application:,,,/iNKORE.UI.WPF.Modern;component/Density/iNKORE.UI.WPF.Modern;component/Themes/Styles/Compact.xaml&quot; /&gt;
&lt;ResourceDictionary Source=&quot;pack://application:,,,/iNKORE.UI.WPF.Modern;component/Density/iNKORE.UI.WPF.Modern;component/Themes/Controls/Compact.xaml&quot; /&gt;
&lt;/Grid.Resources&gt;
</sys:String>
</local:ControlExample.Xaml>
Expand Down
4 changes: 2 additions & 2 deletions ....Modern/Themes/Styles/AutoSuggestBox.xaml → ...odern/Themes/Controls/AutoSuggestBox.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Button.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/TextBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Button.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/TextBox.xaml" />
</ResourceDictionary.MergedDictionaries>

<Thickness x:Key="AutoSuggestBoxTopHeaderMargin">0,0,0,8</Thickness>
Expand Down
0 ...E.UI.WPF.Modern/Themes/Styles/Button.xaml → ...UI.WPF.Modern/Themes/Controls/Button.xaml
View file
File renamed without changes.
0 ...UI.WPF.Modern/Themes/Styles/Calendar.xaml → ....WPF.Modern/Themes/Controls/Calendar.xaml
View file
File renamed without changes.
0 ...UI.WPF.Modern/Themes/Styles/CheckBox.xaml → ....WPF.Modern/Themes/Controls/CheckBox.xaml
View file
File renamed without changes.
0 ...UI.WPF.Modern/Themes/Styles/ComboBox.xaml → ....WPF.Modern/Themes/Controls/ComboBox.xaml
View file
File renamed without changes.
0 ....WPF.Modern/Themes/Styles/CommandBar.xaml → ...PF.Modern/Themes/Controls/CommandBar.xaml
View file
File renamed without changes.
0 ...WPF.Modern/Themes/Styles/ContextMenu.xaml → ...F.Modern/Themes/Controls/ContextMenu.xaml
View file
File renamed without changes.
0 ...UI.WPF.Modern/Themes/Styles/DataGrid.xaml → ....WPF.Modern/Themes/Controls/DataGrid.xaml
View file
File renamed without changes.
0 ....WPF.Modern/Themes/Styles/DatePicker.xaml → ...PF.Modern/Themes/Controls/DatePicker.xaml
View file
File renamed without changes.
0 ...UI.WPF.Modern/Themes/Styles/Expander.xaml → ....WPF.Modern/Themes/Controls/Expander.xaml
View file
File renamed without changes.
0 ...PF.Modern/Themes/Styles/GridSplitter.xaml → ....Modern/Themes/Controls/GridSplitter.xaml
View file
File renamed without changes.
0 ...UI.WPF.Modern/Themes/Styles/GroupBox.xaml → ....WPF.Modern/Themes/Controls/GroupBox.xaml
View file
File renamed without changes.
0 ...I.WPF.Modern/Themes/Styles/GroupItem.xaml → ...WPF.Modern/Themes/Controls/GroupItem.xaml
View file
File renamed without changes.
0 ...I.WPF.Modern/Themes/Styles/Hyperlink.xaml → ...WPF.Modern/Themes/Controls/Hyperlink.xaml
View file
File renamed without changes.
0 ....UI.WPF.Modern/Themes/Styles/InfoBar.xaml → ...I.WPF.Modern/Themes/Controls/InfoBar.xaml
View file
File renamed without changes.
0 ...RE.UI.WPF.Modern/Themes/Styles/Label.xaml → ....UI.WPF.Modern/Themes/Controls/Label.xaml
View file
File renamed without changes.
0 ....UI.WPF.Modern/Themes/Styles/ListBox.xaml → ...I.WPF.Modern/Themes/Controls/ListBox.xaml
View file
File renamed without changes.
0 ...UI.WPF.Modern/Themes/Styles/ListView.xaml → ....WPF.Modern/Themes/Controls/ListView.xaml
View file
File renamed without changes.
0 ...ORE.UI.WPF.Modern/Themes/Styles/Menu.xaml → ...E.UI.WPF.Modern/Themes/Controls/Menu.xaml
View file
File renamed without changes.
0 ...UI.WPF.Modern/Themes/Styles/MenuItem.xaml → ....WPF.Modern/Themes/Controls/MenuItem.xaml
View file
File renamed without changes.
0 ...n/Themes/Styles/NavigationBackButton.xaml → ...Themes/Controls/NavigationBackButton.xaml
View file
File renamed without changes.
0 ....Modern/Themes/Styles/NavigationView.xaml → ...odern/Themes/Controls/NavigationView.xaml
View file
File renamed without changes.
0 ...WPF.Modern/Themes/Styles/PasswordBox.xaml → ...F.Modern/Themes/Controls/PasswordBox.xaml
View file
File renamed without changes.
0 ...I.WPF.Modern/Themes/Styles/PipsPager.xaml → ...WPF.Modern/Themes/Controls/PipsPager.xaml
View file
File renamed without changes.
0 ...RE.UI.WPF.Modern/Themes/Styles/Pivot.xaml → ....UI.WPF.Modern/Themes/Controls/Pivot.xaml
View file
File renamed without changes.
0 ...WPF.Modern/Themes/Styles/ProgressBar.xaml → ...F.Modern/Themes/Controls/ProgressBar.xaml
View file
File renamed without changes.
0 ...WPF.Modern/Themes/Styles/RadioButton.xaml → ...F.Modern/Themes/Controls/RadioButton.xaml
View file
File renamed without changes.
0 ...F.Modern/Themes/Styles/RatingControl.xaml → ...Modern/Themes/Controls/RatingControl.xaml
View file
File renamed without changes.
0 ...PF.Modern/Themes/Styles/RepeatButton.xaml → ....Modern/Themes/Controls/RepeatButton.xaml
View file
File renamed without changes.
0 ....WPF.Modern/Themes/Styles/ResizeGrip.xaml → ...PF.Modern/Themes/Controls/ResizeGrip.xaml
View file
File renamed without changes.
0 ...WPF.Modern/Themes/Styles/RichTextBox.xaml → ...F.Modern/Themes/Controls/RichTextBox.xaml
View file
File renamed without changes.
0 ...I.WPF.Modern/Themes/Styles/ScrollBar.xaml → ...WPF.Modern/Themes/Controls/ScrollBar.xaml
View file
File renamed without changes.
0 ...PF.Modern/Themes/Styles/ScrollViewer.xaml → ....Modern/Themes/Controls/ScrollViewer.xaml
View file
File renamed without changes.
0 ...E.UI.WPF.Modern/Themes/Styles/Slider.xaml → ...UI.WPF.Modern/Themes/Controls/Slider.xaml
View file
File renamed without changes.
0 ...I.WPF.Modern/Themes/Styles/StatusBar.xaml → ...WPF.Modern/Themes/Controls/StatusBar.xaml
View file
File renamed without changes.
0 ....WPF.Modern/Themes/Styles/TabControl.xaml → ...PF.Modern/Themes/Controls/TabControl.xaml
View file
File renamed without changes.
0 ...WPF.Modern/Themes/Styles/TeachingTip.xaml → ...F.Modern/Themes/Controls/TeachingTip.xaml
View file
File renamed without changes.
0 ....UI.WPF.Modern/Themes/Styles/TextBox.xaml → ...I.WPF.Modern/Themes/Controls/TextBox.xaml
View file
File renamed without changes.
0 ....WPF.Modern/Themes/Styles/TextStyles.xaml → ...PF.Modern/Themes/Controls/TextStyles.xaml
View file
File renamed without changes.
0 ....WPF.Modern/Themes/Styles/TimePicker.xaml → ...PF.Modern/Themes/Controls/TimePicker.xaml
View file
File renamed without changes.
0 ...PF.Modern/Themes/Styles/ToggleButton.xaml → ....Modern/Themes/Controls/ToggleButton.xaml
View file
File renamed without changes.
0 ....UI.WPF.Modern/Themes/Styles/ToolBar.xaml → ...I.WPF.Modern/Themes/Controls/ToolBar.xaml
View file
File renamed without changes.
0 ....UI.WPF.Modern/Themes/Styles/ToolTip.xaml → ...I.WPF.Modern/Themes/Controls/ToolTip.xaml
View file
File renamed without changes.
0 ...UI.WPF.Modern/Themes/Styles/TreeView.xaml → ....WPF.Modern/Themes/Controls/TreeView.xaml
View file
File renamed without changes.
0 ...E.UI.WPF.Modern/Themes/Styles/Window.xaml → ...UI.WPF.Modern/Themes/Controls/Window.xaml
View file
File renamed without changes.
82 changes: 41 additions & 41 deletions source/iNKORE.UI.WPF.Modern/Themes/ControlsResources.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,47 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Resources/Fonts/Fonts.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/AutoSuggestBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Calendar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/CheckBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ComboBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/CommandBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ContextMenu.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/DataGrid.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/DatePicker.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Expander.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/GridSplitter.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/GroupBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/GroupItem.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Hyperlink.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/InfoBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Label.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ListBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ListView.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Menu.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/MenuItem.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/NavigationBackButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/NavigationView.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/PasswordBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/PipsPager.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Pivot.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ProgressBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/RadioButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/RatingControl.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/RepeatButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ResizeGrip.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/RichTextBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ScrollBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ScrollViewer.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Slider.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/StatusBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/TabControl.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/TeachingTip.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/TimePicker.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ToggleButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ToolBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/TreeView.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Window.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/AutoSuggestBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Calendar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/CheckBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ComboBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/CommandBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ContextMenu.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/DataGrid.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/DatePicker.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Expander.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/GridSplitter.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/GroupBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/GroupItem.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Hyperlink.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/InfoBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Label.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ListBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ListView.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Menu.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/MenuItem.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/NavigationBackButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/NavigationView.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/PasswordBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/PipsPager.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Pivot.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ProgressBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/RadioButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/RatingControl.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/RepeatButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ResizeGrip.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/RichTextBox.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ScrollBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ScrollViewer.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Slider.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/StatusBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/TabControl.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/TeachingTip.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/TimePicker.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ToggleButton.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ToolBar.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/TreeView.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Window.xaml" />
</ResourceDictionary.MergedDictionaries>

<m:StaticResource x:Key="ContentControlThemeFontFamily" ResourceKey="{x:Static SystemFonts.MessageFontFamilyKey}" />
Expand Down
2 changes: 1 addition & 1 deletion source/iNKORE.UI.WPF.Modern/Themes/TextContextMenu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls">

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/ContextMenu.xaml" />
<ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/ContextMenu.xaml" />
</ResourceDictionary.MergedDictionaries>

<Style BasedOn="{StaticResource ContextMenuStyleBase}" TargetType="local:TextContextMenu" />
Expand Down
2 changes: 1 addition & 1 deletion source/samples/SamplesCommon/SamplePages/SampleCompactSizingPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
mc:Ignorable="d">

<Page.Resources>
<ResourceDictionary Source="pack://application:,,,/iNKORE.UI.WPF.Modern;component/Density/iNKORE.UI.WPF.Modern;component/Themes/Styles/Compact.xaml" />
<ResourceDictionary Source="pack://application:,,,/iNKORE.UI.WPF.Modern;component/Density/iNKORE.UI.WPF.Modern;component/Themes/Controls/Compact.xaml" />
</Page.Resources>

<Grid Background="{DynamicResource ApplicationPageBackgroundThemeBrush}">
Expand Down

0 comments on commit 50ec7c1

Please sign in to comment.