From 9417f509d157b0d9d0cf0454f02393ae91f07981 Mon Sep 17 00:00:00 2001
From: Difegue <sugoi@cock.li>
Date: Tue, 24 Sep 2024 17:25:03 +0200
Subject: [PATCH 1/2] Fix TextControl placeholders not using the proper color

---
 src/Wpf.Ui/Resources/Theme/Dark.xaml  | 2 +-
 src/Wpf.Ui/Resources/Theme/Light.xaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Wpf.Ui/Resources/Theme/Dark.xaml b/src/Wpf.Ui/Resources/Theme/Dark.xaml
index 5a8200d85..2d3d1ece8 100644
--- a/src/Wpf.Ui/Resources/Theme/Dark.xaml
+++ b/src/Wpf.Ui/Resources/Theme/Dark.xaml
@@ -594,7 +594,7 @@
     <SolidColorBrush x:Key="TextControlForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
     <SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{DynamicResource SystemAccentColorPrimary}" />
     <SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextFillColorSecondary}" />
+    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextPlaceholderColor}" />
     <SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
 
     <!--  ThumbRate  -->
diff --git a/src/Wpf.Ui/Resources/Theme/Light.xaml b/src/Wpf.Ui/Resources/Theme/Light.xaml
index a8288560c..304f53ee4 100644
--- a/src/Wpf.Ui/Resources/Theme/Light.xaml
+++ b/src/Wpf.Ui/Resources/Theme/Light.xaml
@@ -595,7 +595,7 @@
     <SolidColorBrush x:Key="TextControlForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
     <SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{DynamicResource SystemAccentColorPrimary}" />
     <SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
-    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextFillColorSecondary}" />
+    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextPlaceholderColor}" />
     <SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
 
     <!--  ThumbRate  -->

From b14d9780d54cb1186a57d7cc05f6b7647a85733a Mon Sep 17 00:00:00 2001
From: Difegue <sugoi@cock.li>
Date: Tue, 24 Sep 2024 17:28:26 +0200
Subject: [PATCH 2/2] Fix InfoBar padding so it's centered for single-line
 messages

---
 src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml b/src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml
index 44da6f3f1..0f38eeb10 100644
--- a/src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml
+++ b/src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml
@@ -40,7 +40,7 @@
                     <Grid x:Name="InfoBarRoot">
                         <Border
                             x:Name="ContentBorder"
-                            Padding="16,14,16,10"
+                            Padding="16,12"
                             HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalAlignment}"
                             Background="{TemplateBinding Background}"