Merge branch 'master' into devsecops

pipeline-foundation · Dec 10, 2023 · 05b3e88 · 05b3e88
2 parents d31f36d + de437bd
commit 05b3e88
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ModernWpf.Controls/CommandBar/CommandBar.xaml b/ModernWpf.Controls/CommandBar/CommandBar.xaml
@@ -55,7 +55,6 @@
                         <Grid
                             x:Name="ContentRoot"
                             VerticalAlignment="Top"
-                            Margin="{TemplateBinding Padding}"
                             Height="{TemplateBinding Height}"
                             MinHeight="{DynamicResource AppBarThemeCompactHeight}"
                             Background="{TemplateBinding Background}">
@@ -74,6 +73,7 @@
                                 -->
                                 <ContentControl
                                     x:Name="ContentControl"
+                                    Margin="{TemplateBinding Padding}"
                                     Content="{TemplateBinding Header}"
                                     ContentTemplate="{TemplateBinding HeaderTemplate}"
                                     Foreground="{TemplateBinding Foreground}"

diff --git a/ModernWpf/ThemeResources/Dark.xaml b/ModernWpf/ThemeResources/Dark.xaml
@@ -271,7 +271,7 @@
 
     <Color x:Key="SmokeFillColorDefault">#332C2C2C</Color>
 
-    <Color x:Key="LayerFillColorDefault">#09FFFFFF</Color>
+    <Color x:Key="LayerFillColorDefault">#4C3A3A3A</Color>
     <Color x:Key="LayerFillColorAlt">#0DFFFFFF</Color>
     <Color x:Key="LayerOnAcrylicFillColorDefault">#09FFFFFF</Color>
     <Color x:Key="LayerOnAccentAcrylicFillColorDefault">#09FFFFFF</Color>
@@ -1304,7 +1304,7 @@
 
     <!-- Resources for ProgressRing -->
     <m:StaticResource x:Key="ProgressRingForegroundThemeBrush" ResourceKey="AccentFillColorDefaultBrush" />
-    <m:StaticResource x:Key="ProgressRingBackgroundThemeBrush" ResourceKey="ControlFillColorTertiaryBrush" />
+    <m:StaticResource x:Key="ProgressRingBackgroundThemeBrush" ResourceKey="ControlFillColorTransparentBrush" />
 
     <!-- Resources for RadioButton -->
     <sys:Double x:Key="RadioButtonBorderThemeThickness">1</sys:Double>

diff --git a/ModernWpf/ThemeResources/Light.xaml b/ModernWpf/ThemeResources/Light.xaml
@@ -200,7 +200,7 @@
     <!-- Colors -->
 
     <Color x:Key="TextFillColorPrimary">#E4000000</Color>
-    <Color x:Key="TextFillColorSecondary">#93000000</Color>
+    <Color x:Key="TextFillColorSecondary">#9E000000</Color>
     <Color x:Key="TextFillColorTertiary">#72000000</Color>
     <Color x:Key="TextFillColorDisabled">#5C000000</Color>
     <Color x:Key="TextFillColorInverse">#FFFFFF</Color>
@@ -1307,7 +1307,7 @@
 
     <!-- Resources for ProgressRing -->
     <m:StaticResource x:Key="ProgressRingForegroundThemeBrush" ResourceKey="AccentFillColorDefaultBrush" />
-    <m:StaticResource x:Key="ProgressRingBackgroundThemeBrush" ResourceKey="ControlFillColorTertiaryBrush" />
+    <m:StaticResource x:Key="ProgressRingBackgroundThemeBrush" ResourceKey="ControlFillColorTransparentBrush" />
 
     <!-- Resources for RadioButton -->
     <sys:Double x:Key="RadioButtonBorderThemeThickness">1</sys:Double>