-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #387 from AvaloniaCommunity/avalonia-11.1
Avalonia 11.1
- Loading branch information
Showing
20 changed files
with
139 additions
and
231 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,5 @@ | ||
| <ResourceDictionary xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> | ||
| <ResourceDictionary.MergedDictionaries> | ||
| <ResourceInclude Source="avares://Material.Styles/Resources/Themes/RadioButton.axaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
|
|
||
| <ControlTheme x:Key="RadioButton" TargetType="RadioButton" | ||
| BasedOn="{StaticResource MaterialButtonlikeRadioButton}" /> | ||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 0 additions & 8 deletions
8
Material.Styles/Resources/Compatibility/SeparatorClasses.axaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 12 additions & 19 deletions
31
Material.Styles/Resources/Compatibility/SliderClasses.axaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,13 @@ | ||
| <Styles xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" > | ||
| <Styles.Resources> | ||
| <ResourceDictionary> | ||
| <ResourceDictionary.MergedDictionaries> | ||
| <ResourceInclude Source="avares://Material.Styles/Resources/Themes/Slider.axaml"/> | ||
| </ResourceDictionary.MergedDictionaries> | ||
| </ResourceDictionary> | ||
| </Styles.Resources> | ||
|
|
||
| <Style Selector="Slider.discrete, Slider.Discrete"> | ||
| <Setter Property="Theme" Value="{StaticResource MaterialDiscreteSliderV2}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector="Slider.material-v1"> | ||
| <Setter Property="Theme" Value="{StaticResource MaterialSliderV1}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector="Slider.material-v1.discrete" /> | ||
| </Styles> | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> | ||
|
|
||
| <Style Selector="Slider.discrete, Slider.Discrete"> | ||
| <Setter Property="Theme" Value="{StaticResource MaterialDiscreteSliderV2}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector="Slider.material-v1"> | ||
| <Setter Property="Theme" Value="{StaticResource MaterialSliderV1}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector="Slider.material-v1.discrete" /> | ||
| </Styles> |
8 changes: 0 additions & 8 deletions
8
Material.Styles/Resources/Compatibility/TabControlClasses.axaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
218 changes: 105 additions & 113 deletions
218
Material.Styles/Resources/Compatibility/TextBlockClasses.axaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,114 +1,106 @@ | ||
| <Styles xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" > | ||
| <Styles.Resources> | ||
| <ResourceDictionary> | ||
| <ResourceDictionary.MergedDictionaries> | ||
| <ResourceInclude Source="avares://Material.Styles/Resources/Themes/TextBlock.axaml"/> | ||
| </ResourceDictionary.MergedDictionaries> | ||
| </ResourceDictionary> | ||
| </Styles.Resources> | ||
|
|
||
| <Style Selector=":is(Control).Caption"> | ||
| <Setter Property="Theme" Value="{StaticResource CaptionTextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Body1"> | ||
| <Setter Property="Theme" Value="{StaticResource Body1TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Body2"> | ||
| <Setter Property="Theme" Value="{StaticResource Body2TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Overline"> | ||
| <Setter Property="Theme" Value="{StaticResource OverlineTextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Subtitle1"> | ||
| <Setter Property="Theme" Value="{StaticResource Subtitle1TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Subtitle2"> | ||
| <Setter Property="Theme" Value="{StaticResource Subtitle2TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline6"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline6TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline5"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline5TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline4"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline4TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline3"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline3TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline2"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline2TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline1"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline1TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Link"> | ||
| <Setter Property="Theme" Value="{StaticResource LinkTextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).caption"> | ||
| <Setter Property="Theme" Value="{StaticResource CaptionTextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).body1"> | ||
| <Setter Property="Theme" Value="{StaticResource Body1TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).body2"> | ||
| <Setter Property="Theme" Value="{StaticResource Body2TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).overline"> | ||
| <Setter Property="Theme" Value="{StaticResource OverlineTextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).subtitle1"> | ||
| <Setter Property="Theme" Value="{StaticResource Subtitle1TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).subtitle2"> | ||
| <Setter Property="Theme" Value="{StaticResource Subtitle2TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline6"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline6TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline5"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline5TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline4"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline4TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline3"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline3TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline2"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline2TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline1"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline1TextBlock}"/> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).link"> | ||
| <Setter Property="Theme" Value="{StaticResource LinkTextBlock}"/> | ||
| </Style> | ||
| </Styles> | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> | ||
| <Style Selector=":is(Control).Caption"> | ||
| <Setter Property="Theme" Value="{StaticResource CaptionTextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Body1"> | ||
| <Setter Property="Theme" Value="{StaticResource Body1TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Body2"> | ||
| <Setter Property="Theme" Value="{StaticResource Body2TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Overline"> | ||
| <Setter Property="Theme" Value="{StaticResource OverlineTextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Subtitle1"> | ||
| <Setter Property="Theme" Value="{StaticResource Subtitle1TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Subtitle2"> | ||
| <Setter Property="Theme" Value="{StaticResource Subtitle2TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline6"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline6TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline5"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline5TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline4"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline4TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline3"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline3TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline2"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline2TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Headline1"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline1TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).Link"> | ||
| <Setter Property="Theme" Value="{StaticResource LinkTextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).caption"> | ||
| <Setter Property="Theme" Value="{StaticResource CaptionTextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).body1"> | ||
| <Setter Property="Theme" Value="{StaticResource Body1TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).body2"> | ||
| <Setter Property="Theme" Value="{StaticResource Body2TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).overline"> | ||
| <Setter Property="Theme" Value="{StaticResource OverlineTextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).subtitle1"> | ||
| <Setter Property="Theme" Value="{StaticResource Subtitle1TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).subtitle2"> | ||
| <Setter Property="Theme" Value="{StaticResource Subtitle2TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline6"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline6TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline5"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline5TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline4"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline4TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline3"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline3TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline2"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline2TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).headline1"> | ||
| <Setter Property="Theme" Value="{StaticResource Headline1TextBlock}" /> | ||
| </Style> | ||
|
|
||
| <Style Selector=":is(Control).link"> | ||
| <Setter Property="Theme" Value="{StaticResource LinkTextBlock}" /> | ||
| </Style> | ||
| </Styles> |
Oops, something went wrong.