Skip to content

Commit 7dda818

Browse files
committed
simplify colors
1 parent f5b9afc commit 7dda818

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}"/>
184184
<Setter Property="wpf:RippleAssist.Feedback" Value="White" />
185185
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource SecondaryAccentBrush}" />
186-
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource MaterialDesignPaper}" />
186+
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource MaterialDesignDivider}" />
187187
<Setter Property="BorderThickness" Value="1"/>
188188
<Setter Property="Cursor" Value="Hand"/>
189189
<Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -278,47 +278,41 @@
278278
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueLightBrush}"/>
279279
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueLightForegroundBrush}"/>
280280
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource PrimaryHueDarkBrush}" />
281-
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource PrimaryHueMidBrush}" />
282281
</Style>
283282

284283
<Style x:Key="MaterialDesignFloatingActionMiniDarkButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignFloatingActionMiniButton}">
285284
<Setter Property="Background" Value="{DynamicResource PrimaryHueDarkBrush}"/>
286285
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueDarkBrush}"/>
287286
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}"/>
288287
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource PrimaryHueLightBrush}" />
289-
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource PrimaryHueMidBrush}" />
290288
</Style>
291289

292290
<Style x:Key="MaterialDesignFloatingActionMiniAccentButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignFloatingActionMiniButton}">
293291
<Setter Property="Background" Value="{DynamicResource SecondaryAccentBrush}"/>
294292
<Setter Property="BorderBrush" Value="{DynamicResource SecondaryAccentBrush}"/>
295293
<Setter Property="Foreground" Value="{DynamicResource SecondaryAccentForegroundBrush}"/>
296294
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource PrimaryHueMidBrush}" />
297-
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource PrimaryHueLightBrush}" />
298295
</Style>
299296

300297
<Style x:Key="MaterialDesignFloatingActionLightButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignFloatingActionButton}">
301298
<Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}"/>
302299
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueLightBrush}"/>
303300
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueLightForegroundBrush}"/>
304301
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource PrimaryHueDarkBrush}" />
305-
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource PrimaryHueMidBrush}" />
306302
</Style>
307303

308304
<Style x:Key="MaterialDesignFloatingActionDarkButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignFloatingActionButton}">
309305
<Setter Property="Background" Value="{DynamicResource PrimaryHueDarkBrush}"/>
310306
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueDarkBrush}"/>
311307
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}"/>
312308
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource PrimaryHueLightBrush}" />
313-
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource PrimaryHueMidBrush}" />
314309
</Style>
315310

316311
<Style x:Key="MaterialDesignFloatingActionAccentButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignFloatingActionButton}">
317312
<Setter Property="Background" Value="{DynamicResource SecondaryAccentBrush}"/>
318313
<Setter Property="BorderBrush" Value="{DynamicResource SecondaryAccentBrush}"/>
319314
<Setter Property="Foreground" Value="{DynamicResource SecondaryAccentForegroundBrush}"/>
320315
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource PrimaryHueMidBrush}" />
321-
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource PrimaryHueLightBrush}" />
322316
</Style>
323317

324318
</ResourceDictionary>

0 commit comments

Comments
 (0)