Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing obsolete button styles. #3407

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Removing obsolete button styles. #3407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f138fa
Removing obsolete button styles.
Keboo Dec 7, 2023
f60d0c7
Adding missed files
Keboo Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions MaterialDesign3.Demo.Wpf/Buttons.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,17 +464,17 @@
materialDesign:RippleAssist.Feedback="#DD000000"
Content="CUSTOM RIPPLE"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
Style="{StaticResource MaterialDesignRaisedAccentButton}"
ToolTip="Resource name: MaterialDesignRaisedAccentButton" />
Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
ToolTip="Resource name: MaterialDesignRaisedSecondaryButton" />
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_22">
<Button Width="{StaticResource ButtonWidth}"
materialDesign:RippleAssist.IsDisabled="True"
Content="NO RIPPLE"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
Style="{StaticResource MaterialDesignRaisedAccentButton}"
ToolTip="Resource name: MaterialDesignRaisedAccentButton" />
Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
ToolTip="Resource name: MaterialDesignRaisedSecondaryButton" />
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_23">
Expand Down Expand Up @@ -572,8 +572,8 @@
<Button Height="{StaticResource ButtonHeight}"
materialDesign:ButtonAssist.CornerRadius="25 25 0 0"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
Style="{StaticResource MaterialDesignRaisedAccentButton}"
ToolTip="MaterialDesignRaisedAccentButton with Round Top Corners">
Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
ToolTip="MaterialDesignRaisedSecondaryButton with Round Top Corners">
<TextBlock Text="25/50 Radius" />
</Button>
</Grid>
Expand Down Expand Up @@ -756,7 +756,7 @@
materialDesign:ButtonProgressAssist.Value="50"
Content="{materialDesign:PackIcon DotsHorizontal}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
Style="{StaticResource MaterialDesignFloatingActionAccentButton}" />
Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}" />
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_31">
Expand Down Expand Up @@ -937,4 +937,4 @@
</smtx:XamlDisplay>
</StackPanel>
</Grid>
</UserControl>
</UserControl>
4 changes: 2 additions & 2 deletions MaterialDesign3.Demo.Wpf/Cards.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
Margin="0,0,16,-20"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}">
Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}">
<materialDesign:PackIcon Kind="Bike" />
</Button>
<StackPanel Grid.Row="1" Margin="8,24,8,0">
Expand Down Expand Up @@ -94,7 +94,7 @@
Margin="0,0,16,-20"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}">
Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}">
<materialDesign:PackIcon Kind="ShareVariant" />
</Button>
<StackPanel Grid.Row="1" Margin="8,24,8,4">
Expand Down
4 changes: 2 additions & 2 deletions MaterialDesign3.Demo.Wpf/Dialogs.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}"
Content="{materialDesign:PackIcon Kind=Plus,
Size=22}"
Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}" />
Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />
</Grid>
</Border>
</materialDesign:DialogHost>
Expand Down Expand Up @@ -319,7 +319,7 @@
Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}"
Content="{materialDesign:PackIcon Kind=Plus,
Size=22}"
Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}" />
Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />
</Grid>
</Border>
</materialDesign:DialogHost>
Expand Down
2 changes: 1 addition & 1 deletion MaterialDesign3.Demo.Wpf/Drawers.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
Margin="4"
Command="{x:Static materialDesign:DrawerHost.OpenDrawerCommand}"
Content="{materialDesign:PackIcon Kind=ArrowAll}"
Style="{StaticResource MaterialDesignRaisedAccentButton}" />
Style="{StaticResource MaterialDesignRaisedSecondaryButton}" />
</Grid>

</materialDesign:DrawerHost>
Expand Down
2 changes: 1 addition & 1 deletion MaterialDesign3.Demo.Wpf/TransitionsDemo/Slide2_Intro.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<Button Grid.Row="1"
HorizontalAlignment="Right"
Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
<materialDesign:PackIcon Kind="StepForward" />
</Button>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion MaterialDesign3.Demo.Wpf/TransitionsDemo/Slide3_Intro.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</Button>
<Button Margin="16"
Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
<materialDesign:PackIcon Kind="StepForward" />
</Button>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion MaterialDesign3.Demo.Wpf/TransitionsDemo/Slide4_CombineTransitions.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<Button Margin="16"
VerticalAlignment="Top"
Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
<materialDesign:PackIcon Kind="StepForward" />
</Button>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion MaterialDesign3.Demo.Wpf/TransitionsDemo/Slide5_TransitioningContent.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<Button Margin="16"
VerticalAlignment="Top"
Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
<materialDesign:PackIcon Kind="StepForward" />
</Button>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion MaterialDesign3.Demo.Wpf/TransitionsDemo/Slide7_MVVM.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<materialDesign:PackIcon Kind="StepBackward" />
</Button>
<!--
<Button Style="{StaticResource MaterialDesignFloatingActionAccentButton}"
<Button Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}"
Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
VerticalAlignment="Top"
Margin="16">
Expand Down
25 changes: 0 additions & 25 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,6 @@
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Secondary.Dark.Foreground}" />
</Style>

<!-- Obsolete -->
<Style x:Key="MaterialDesignRaisedAccentButton"
TargetType="{x:Type ButtonBase}"
BasedOn="{StaticResource MaterialDesignRaisedSecondaryButton}" />

<!--#endregion-->
<!--#region Flat Button-->
<Style x:Key="MaterialDesignFlatButton" TargetType="{x:Type ButtonBase}">
Expand Down Expand Up @@ -294,11 +289,6 @@
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource MaterialDesign.Brush.Secondary.Dark}" />
</Style>

<!-- Obsolete -->
<Style x:Key="MaterialDesignFlatAccentButton"
TargetType="{x:Type ButtonBase}"
BasedOn="{StaticResource MaterialDesignFlatSecondaryButton}" />

<Style x:Key="MaterialDesignFlatLightBgButton"
TargetType="{x:Type ButtonBase}"
BasedOn="{StaticResource MaterialDesignRaisedLightButton}">
Expand Down Expand Up @@ -338,11 +328,6 @@
<Setter Property="wpf:ElevationAssist.Elevation" Value="Dp0" />
</Style>

<!-- Obsolete -->
<Style x:Key="MaterialDesignFlatAccentBgButton"
TargetType="{x:Type ButtonBase}"
BasedOn="{StaticResource MaterialDesignFlatSecondaryMidBgButton}" />

<!--#endregion-->
<!--#region Outlined Button-->

Expand Down Expand Up @@ -674,11 +659,6 @@
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource MaterialDesign.Brush.Secondary.Light}" />
</Style>

<!-- Obsolete -->
<Style x:Key="MaterialDesignFloatingActionMiniAccentButton"
TargetType="{x:Type ButtonBase}"
BasedOn="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />

<Style x:Key="MaterialDesignFloatingActionLightButton"
TargetType="{x:Type ButtonBase}"
BasedOn="{StaticResource MaterialDesignFloatingActionButton}">
Expand Down Expand Up @@ -724,11 +704,6 @@
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource MaterialDesign.Brush.Secondary.Light}" />
</Style>

<!-- Obsolete -->
<Style x:Key="MaterialDesignFloatingActionAccentButton"
TargetType="{x:Type ButtonBase}"
BasedOn="{StaticResource MaterialDesignFloatingActionSecondaryButton}" />

<!--#endregion-->
<!--#region Icon Button-->

Expand Down
Loading