Skip to content

Commit dd33e08

Browse files
Difeguepomianowski
authored andcommitted
Theming fixes (#1236)
* Fix TextControl placeholders not using the proper color * Fix InfoBar padding so it's centered for single-line messages
1 parent 1cd4924 commit dd33e08

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/Wpf.Ui/Controls/InfoBar/InfoBar.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<Grid x:Name="InfoBarRoot">
4141
<Border
4242
x:Name="ContentBorder"
43-
Padding="16,14,16,10"
43+
Padding="16,12"
4444
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
4545
VerticalAlignment="{TemplateBinding VerticalAlignment}"
4646
Background="{TemplateBinding Background}"

src/Wpf.Ui/Resources/Theme/Dark.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@
594594
<SolidColorBrush x:Key="TextControlForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
595595
<SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{DynamicResource SystemAccentColorPrimary}" />
596596
<SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
597-
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextFillColorSecondary}" />
597+
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextPlaceholderColor}" />
598598
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
599599

600600
<!-- ThumbRate -->

src/Wpf.Ui/Resources/Theme/Light.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@
595595
<SolidColorBrush x:Key="TextControlForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
596596
<SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{DynamicResource SystemAccentColorPrimary}" />
597597
<SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
598-
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextFillColorSecondary}" />
598+
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextPlaceholderColor}" />
599599
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
600600

601601
<!-- ThumbRate -->

0 commit comments

Comments
 (0)