Fix styles import

AvaloniaCommunity · Sep 3, 2023 · 0186319 · 0186319
1 parent 3adf2fc
commit 0186319
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Material.Demo/Pages/TogglesDemo.axaml b/Material.Demo/Pages/TogglesDemo.axaml
@@ -149,7 +149,7 @@
                     <controls:Card Padding="0" InsideClipping="True">
                       <controls:Card.Styles>
                         <Style Selector="RadioButton">
-                          <Setter Property="Theme" Value="MaterialButtonlikeRadioButton" />
+                          <Setter Property="Theme" Value="{StaticResource MaterialButtonlikeRadioButton}" />
                         </Style>
                       </controls:Card.Styles>
                       <StackPanel Orientation="Horizontal">
@@ -171,7 +171,7 @@
                     <controls:Card Padding="0" InsideClipping="True" Margin="0,16,0,0">
                       <controls:Card.Styles>
                         <Style Selector="RadioButton">
-                          <Setter Property="Theme" Value="MaterialButtonlikeRadioButton" />
+                          <Setter Property="Theme" Value="{StaticResource MaterialButtonlikeRadioButton}" />
                         </Style>
                       </controls:Card.Styles>
                       <StackPanel Orientation="Horizontal">

diff --git a/Material.Styles/Controls/Clock.axaml b/Material.Styles/Controls/Clock.axaml
@@ -29,7 +29,7 @@
   </ResourceDictionary.MergedDictionaries>
 
   <ControlTheme x:Key="MaterialCircleClockTimeFormatRadioButton" TargetType="RadioButton"
-                BasedOn="MaterialButtonlikeRadioButton">
+                BasedOn="{StaticResource MaterialButtonlikeRadioButton}">
     <Setter Property="Padding" Value="8" />
     <Setter Property="TextBlock.FontWeight" Value="Medium" />
 

diff --git a/Material.Styles/Resources/Compatibility/Index.axaml b/Material.Styles/Resources/Compatibility/Index.axaml
@@ -17,12 +17,12 @@
   <StyleInclude Source="avares://Material.Styles/Resources/Compatibility/TabControlClasses.axaml" />
   <StyleInclude Source="avares://Material.Styles/Resources/Compatibility/ProgressBarClasses.axaml" />
   <StyleInclude Source="avares://Material.Styles/Resources/Compatibility/SeparatorClasses.axaml" />
-  <StyleInclude Source="avares://Material.Styles/Resources/Compatibility/RadioButtons.axaml" />
-  <StyleInclude Source="avares://Material.Styles/Resources/Compatibility/ToggleButtons.axaml" />
 
   <Styles.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Material.Styles/Resources/Compatibility/ToggleButtons.axaml" />
+        <ResourceInclude Source="avares://Material.Styles/Resources/Compatibility/RadioButtons.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Compatibility/BrushesNames.axaml" />
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>