Skip to content

Commit 134cc65

Browse files
committed
Merge branch 'fixFlatButtonBorderStyle' of https://github.com/Keboo/MaterialDesignInXamlToolkit into Keboo-fixFlatButtonBorderStyle
2 parents 81510cc + 615e183 commit 134cc65

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource MaterialDesignFlatButtonRipple}" />
113113
<Setter Property="TextBlock.FontWeight" Value="Medium"/>
114114
<Setter Property="TextBlock.FontSize" Value="14"/>
115-
<Setter Property="BorderThickness" Value="1"/>
115+
<Setter Property="BorderThickness" Value="0"/>
116116
<Setter Property="HorizontalContentAlignment" Value="Center"/>
117117
<Setter Property="VerticalContentAlignment" Value="Center"/>
118118
<Setter Property="Padding" Value="16 4 16 4"/>
@@ -121,7 +121,8 @@
121121
<Setter.Value>
122122
<ControlTemplate TargetType="{x:Type Button}">
123123
<Grid>
124-
<Border Background="{TemplateBinding Background}" x:Name="border" CornerRadius="2">
124+
<Border Background="{TemplateBinding Background}" x:Name="border" CornerRadius="2"
125+
BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
125126
<wpf:Ripple Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"
126127
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
127128
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"

0 commit comments

Comments
 (0)