diff --git a/forui/lib/src/widgets/button/button_content.dart b/forui/lib/src/widgets/button/button_content.dart index d58c9c4a4..200fb4903 100644 --- a/forui/lib/src/widgets/button/button_content.dart +++ b/forui/lib/src/widgets/button/button_content.dart @@ -75,12 +75,14 @@ class FButtonContentStyle with Diagnosticable { vertical: 12.5, ), enabledTextStyle = typography.base.copyWith( - fontWeight: FontWeight.w500, color: enabled, + fontWeight: FontWeight.w500, + height: 1, ), disabledTextStyle = typography.base.copyWith( - fontWeight: FontWeight.w500, color: disabled, + fontWeight: FontWeight.w500, + height: 1, ); /// Returns a copy of this [FButtonContentStyle] with the given properties replaced. diff --git a/forui/lib/src/widgets/dialog/dialog.dart b/forui/lib/src/widgets/dialog/dialog.dart index b9f9dff83..d75665f67 100644 --- a/forui/lib/src/widgets/dialog/dialog.dart +++ b/forui/lib/src/widgets/dialog/dialog.dart @@ -136,7 +136,7 @@ class FDialog extends StatelessWidget { removeBottom: true, context: context, child: Align( - child: DefaultTextStyle( + child: DefaultTextStyle.merge( style: typography.base.copyWith(color: theme.colorScheme.foreground), child: Semantics( scopesRoute: true, diff --git a/forui/lib/src/widgets/header/header.dart b/forui/lib/src/widgets/header/header.dart index cc446ed91..16346309d 100644 --- a/forui/lib/src/widgets/header/header.dart +++ b/forui/lib/src/widgets/header/header.dart @@ -51,13 +51,11 @@ class FHeader extends StatelessWidget { this.rawTitle, this.actions = const [], super.key, - }): - assert((title != null) ^ (rawTitle != null), 'title or rawTitle must be provided, but not both.'); + }) : assert((title != null) ^ (rawTitle != null), 'title or rawTitle must be provided, but not both.'); @override Widget build(BuildContext context) { final style = this.style ?? context.theme.headerStyle; - final typography = context.theme.typography; final title = switch ((this.title, rawTitle)) { (final String title, _) => Text(title), @@ -106,8 +104,9 @@ final class FHeaderStyle with Diagnosticable { /// Creates a [FHeaderStyle] that inherits its properties from the given [FColorScheme] and [FTypography]. FHeaderStyle.inherit({required FColorScheme colorScheme, required FTypography typography}) : titleTextStyle = typography.xl3.copyWith( - fontWeight: FontWeight.w700, color: colorScheme.foreground, + fontWeight: FontWeight.w700, + height: 1, ), action = FHeaderActionStyle.inherit(colorScheme: colorScheme); @@ -126,13 +125,15 @@ final class FHeaderStyle with Diagnosticable { /// print(style.titleTextStyle == copy.titleTextStyle); // true /// print(style.action == copy.action); // false /// ``` - @useResult FHeaderStyle copyWith({ + @useResult + FHeaderStyle copyWith({ TextStyle? titleTextStyle, FHeaderActionStyle? action, - }) => FHeaderStyle( - titleTextStyle: titleTextStyle ?? this.titleTextStyle, - action: action ?? this.action, - ); + }) => + FHeaderStyle( + titleTextStyle: titleTextStyle ?? this.titleTextStyle, + action: action ?? this.action, + ); @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { diff --git a/forui/test/golden/badge/zinc-dark-Variant.destructive-raw-badge-content.png b/forui/test/golden/badge/zinc-dark-Variant.destructive-raw-badge-content.png index 862d5f4fc..852f5c06e 100644 Binary files a/forui/test/golden/badge/zinc-dark-Variant.destructive-raw-badge-content.png and b/forui/test/golden/badge/zinc-dark-Variant.destructive-raw-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-dark-Variant.destructive-text-badge-content.png b/forui/test/golden/badge/zinc-dark-Variant.destructive-text-badge-content.png index 862d5f4fc..852f5c06e 100644 Binary files a/forui/test/golden/badge/zinc-dark-Variant.destructive-text-badge-content.png and b/forui/test/golden/badge/zinc-dark-Variant.destructive-text-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-dark-Variant.outline-raw-badge-content.png b/forui/test/golden/badge/zinc-dark-Variant.outline-raw-badge-content.png index 4ad642ac3..edf3f6a76 100644 Binary files a/forui/test/golden/badge/zinc-dark-Variant.outline-raw-badge-content.png and b/forui/test/golden/badge/zinc-dark-Variant.outline-raw-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-dark-Variant.outline-text-badge-content.png b/forui/test/golden/badge/zinc-dark-Variant.outline-text-badge-content.png index 4ad642ac3..edf3f6a76 100644 Binary files a/forui/test/golden/badge/zinc-dark-Variant.outline-text-badge-content.png and b/forui/test/golden/badge/zinc-dark-Variant.outline-text-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-dark-Variant.primary-raw-badge-content.png b/forui/test/golden/badge/zinc-dark-Variant.primary-raw-badge-content.png index d23304fa8..51e617f3c 100644 Binary files a/forui/test/golden/badge/zinc-dark-Variant.primary-raw-badge-content.png and b/forui/test/golden/badge/zinc-dark-Variant.primary-raw-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-dark-Variant.primary-text-badge-content.png b/forui/test/golden/badge/zinc-dark-Variant.primary-text-badge-content.png index d23304fa8..51e617f3c 100644 Binary files a/forui/test/golden/badge/zinc-dark-Variant.primary-text-badge-content.png and b/forui/test/golden/badge/zinc-dark-Variant.primary-text-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-dark-Variant.secondary-raw-badge-content.png b/forui/test/golden/badge/zinc-dark-Variant.secondary-raw-badge-content.png index ab2c1677b..d190ddf8d 100644 Binary files a/forui/test/golden/badge/zinc-dark-Variant.secondary-raw-badge-content.png and b/forui/test/golden/badge/zinc-dark-Variant.secondary-raw-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-dark-Variant.secondary-text-badge-content.png b/forui/test/golden/badge/zinc-dark-Variant.secondary-text-badge-content.png index ab2c1677b..d190ddf8d 100644 Binary files a/forui/test/golden/badge/zinc-dark-Variant.secondary-text-badge-content.png and b/forui/test/golden/badge/zinc-dark-Variant.secondary-text-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-light-Variant.destructive-raw-badge-content.png b/forui/test/golden/badge/zinc-light-Variant.destructive-raw-badge-content.png index 320bda7eb..e75e8ed3c 100644 Binary files a/forui/test/golden/badge/zinc-light-Variant.destructive-raw-badge-content.png and b/forui/test/golden/badge/zinc-light-Variant.destructive-raw-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-light-Variant.destructive-text-badge-content.png b/forui/test/golden/badge/zinc-light-Variant.destructive-text-badge-content.png index 320bda7eb..e75e8ed3c 100644 Binary files a/forui/test/golden/badge/zinc-light-Variant.destructive-text-badge-content.png and b/forui/test/golden/badge/zinc-light-Variant.destructive-text-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-light-Variant.outline-raw-badge-content.png b/forui/test/golden/badge/zinc-light-Variant.outline-raw-badge-content.png index 152c49ec0..ba2865582 100644 Binary files a/forui/test/golden/badge/zinc-light-Variant.outline-raw-badge-content.png and b/forui/test/golden/badge/zinc-light-Variant.outline-raw-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-light-Variant.outline-text-badge-content.png b/forui/test/golden/badge/zinc-light-Variant.outline-text-badge-content.png index 152c49ec0..ba2865582 100644 Binary files a/forui/test/golden/badge/zinc-light-Variant.outline-text-badge-content.png and b/forui/test/golden/badge/zinc-light-Variant.outline-text-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-light-Variant.primary-raw-badge-content.png b/forui/test/golden/badge/zinc-light-Variant.primary-raw-badge-content.png index f3162779e..932110f89 100644 Binary files a/forui/test/golden/badge/zinc-light-Variant.primary-raw-badge-content.png and b/forui/test/golden/badge/zinc-light-Variant.primary-raw-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-light-Variant.primary-text-badge-content.png b/forui/test/golden/badge/zinc-light-Variant.primary-text-badge-content.png index f3162779e..932110f89 100644 Binary files a/forui/test/golden/badge/zinc-light-Variant.primary-text-badge-content.png and b/forui/test/golden/badge/zinc-light-Variant.primary-text-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-light-Variant.secondary-raw-badge-content.png b/forui/test/golden/badge/zinc-light-Variant.secondary-raw-badge-content.png index 7477e6029..66d4e0442 100644 Binary files a/forui/test/golden/badge/zinc-light-Variant.secondary-raw-badge-content.png and b/forui/test/golden/badge/zinc-light-Variant.secondary-raw-badge-content.png differ diff --git a/forui/test/golden/badge/zinc-light-Variant.secondary-text-badge-content.png b/forui/test/golden/badge/zinc-light-Variant.secondary-text-badge-content.png index 7477e6029..66d4e0442 100644 Binary files a/forui/test/golden/badge/zinc-light-Variant.secondary-text-badge-content.png and b/forui/test/golden/badge/zinc-light-Variant.secondary-text-badge-content.png differ diff --git a/forui/test/golden/button/zinc-dark-Variant.destructive-disabled-button-content.png b/forui/test/golden/button/zinc-dark-Variant.destructive-disabled-button-content.png index 2dbb03e6d..c1a56444d 100644 Binary files a/forui/test/golden/button/zinc-dark-Variant.destructive-disabled-button-content.png and b/forui/test/golden/button/zinc-dark-Variant.destructive-disabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-dark-Variant.destructive-enabled-button-content.png b/forui/test/golden/button/zinc-dark-Variant.destructive-enabled-button-content.png index 46daf75eb..7bf9f1cc3 100644 Binary files a/forui/test/golden/button/zinc-dark-Variant.destructive-enabled-button-content.png and b/forui/test/golden/button/zinc-dark-Variant.destructive-enabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-dark-Variant.outline-disabled-button-content.png b/forui/test/golden/button/zinc-dark-Variant.outline-disabled-button-content.png index 1d244d672..88df4a935 100644 Binary files a/forui/test/golden/button/zinc-dark-Variant.outline-disabled-button-content.png and b/forui/test/golden/button/zinc-dark-Variant.outline-disabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-dark-Variant.outline-enabled-button-content.png b/forui/test/golden/button/zinc-dark-Variant.outline-enabled-button-content.png index eb9221b23..effa0053e 100644 Binary files a/forui/test/golden/button/zinc-dark-Variant.outline-enabled-button-content.png and b/forui/test/golden/button/zinc-dark-Variant.outline-enabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-dark-Variant.primary-disabled-button-content.png b/forui/test/golden/button/zinc-dark-Variant.primary-disabled-button-content.png index fa0f554af..dfe43a958 100644 Binary files a/forui/test/golden/button/zinc-dark-Variant.primary-disabled-button-content.png and b/forui/test/golden/button/zinc-dark-Variant.primary-disabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-dark-Variant.primary-enabled-button-content.png b/forui/test/golden/button/zinc-dark-Variant.primary-enabled-button-content.png index 7e3e7f7b0..db442bdd4 100644 Binary files a/forui/test/golden/button/zinc-dark-Variant.primary-enabled-button-content.png and b/forui/test/golden/button/zinc-dark-Variant.primary-enabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-dark-Variant.secondary-disabled-button-content.png b/forui/test/golden/button/zinc-dark-Variant.secondary-disabled-button-content.png index 721d21df0..b0df6c978 100644 Binary files a/forui/test/golden/button/zinc-dark-Variant.secondary-disabled-button-content.png and b/forui/test/golden/button/zinc-dark-Variant.secondary-disabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-dark-Variant.secondary-enabled-button-content.png b/forui/test/golden/button/zinc-dark-Variant.secondary-enabled-button-content.png index df13b4775..68c6ffaf5 100644 Binary files a/forui/test/golden/button/zinc-dark-Variant.secondary-enabled-button-content.png and b/forui/test/golden/button/zinc-dark-Variant.secondary-enabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-light-Variant.destructive-disabled-button-content.png b/forui/test/golden/button/zinc-light-Variant.destructive-disabled-button-content.png index 811f86e4d..181943bbe 100644 Binary files a/forui/test/golden/button/zinc-light-Variant.destructive-disabled-button-content.png and b/forui/test/golden/button/zinc-light-Variant.destructive-disabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-light-Variant.destructive-enabled-button-content.png b/forui/test/golden/button/zinc-light-Variant.destructive-enabled-button-content.png index 2113bd3dc..ebec052d9 100644 Binary files a/forui/test/golden/button/zinc-light-Variant.destructive-enabled-button-content.png and b/forui/test/golden/button/zinc-light-Variant.destructive-enabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-light-Variant.outline-disabled-button-content.png b/forui/test/golden/button/zinc-light-Variant.outline-disabled-button-content.png index 74f73bdeb..77b15abfc 100644 Binary files a/forui/test/golden/button/zinc-light-Variant.outline-disabled-button-content.png and b/forui/test/golden/button/zinc-light-Variant.outline-disabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-light-Variant.outline-enabled-button-content.png b/forui/test/golden/button/zinc-light-Variant.outline-enabled-button-content.png index 5db85d579..9520937e0 100644 Binary files a/forui/test/golden/button/zinc-light-Variant.outline-enabled-button-content.png and b/forui/test/golden/button/zinc-light-Variant.outline-enabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-light-Variant.primary-disabled-button-content.png b/forui/test/golden/button/zinc-light-Variant.primary-disabled-button-content.png index 8ff1fdef2..d697dada1 100644 Binary files a/forui/test/golden/button/zinc-light-Variant.primary-disabled-button-content.png and b/forui/test/golden/button/zinc-light-Variant.primary-disabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-light-Variant.primary-enabled-button-content.png b/forui/test/golden/button/zinc-light-Variant.primary-enabled-button-content.png index 6cd3e1746..16ed97b54 100644 Binary files a/forui/test/golden/button/zinc-light-Variant.primary-enabled-button-content.png and b/forui/test/golden/button/zinc-light-Variant.primary-enabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-light-Variant.secondary-disabled-button-content.png b/forui/test/golden/button/zinc-light-Variant.secondary-disabled-button-content.png index eddd1aac9..2bd9623c3 100644 Binary files a/forui/test/golden/button/zinc-light-Variant.secondary-disabled-button-content.png and b/forui/test/golden/button/zinc-light-Variant.secondary-disabled-button-content.png differ diff --git a/forui/test/golden/button/zinc-light-Variant.secondary-enabled-button-content.png b/forui/test/golden/button/zinc-light-Variant.secondary-enabled-button-content.png index 3c4f00355..ac1da6c0e 100644 Binary files a/forui/test/golden/button/zinc-light-Variant.secondary-enabled-button-content.png and b/forui/test/golden/button/zinc-light-Variant.secondary-enabled-button-content.png differ diff --git a/forui/test/golden/card/zinc-dark-raw-card-content.png b/forui/test/golden/card/zinc-dark-raw-card-content.png index 386dc5ef3..8b71b1c29 100644 Binary files a/forui/test/golden/card/zinc-dark-raw-card-content.png and b/forui/test/golden/card/zinc-dark-raw-card-content.png differ diff --git a/forui/test/golden/card/zinc-dark-text-card-content.png b/forui/test/golden/card/zinc-dark-text-card-content.png index 386dc5ef3..8b71b1c29 100644 Binary files a/forui/test/golden/card/zinc-dark-text-card-content.png and b/forui/test/golden/card/zinc-dark-text-card-content.png differ diff --git a/forui/test/golden/card/zinc-light-raw-card-content.png b/forui/test/golden/card/zinc-light-raw-card-content.png index 7feb996ed..2dbf01b92 100644 Binary files a/forui/test/golden/card/zinc-light-raw-card-content.png and b/forui/test/golden/card/zinc-light-raw-card-content.png differ diff --git a/forui/test/golden/card/zinc-light-text-card-content.png b/forui/test/golden/card/zinc-light-text-card-content.png index 7feb996ed..2dbf01b92 100644 Binary files a/forui/test/golden/card/zinc-light-text-card-content.png and b/forui/test/golden/card/zinc-light-text-card-content.png differ diff --git a/forui/test/golden/dialog/zinc-dark-Axis.horizontal-raw-dialog-content.png b/forui/test/golden/dialog/zinc-dark-Axis.horizontal-raw-dialog-content.png index 6e0bac4d3..4558c75c6 100644 Binary files a/forui/test/golden/dialog/zinc-dark-Axis.horizontal-raw-dialog-content.png and b/forui/test/golden/dialog/zinc-dark-Axis.horizontal-raw-dialog-content.png differ diff --git a/forui/test/golden/dialog/zinc-dark-Axis.horizontal-text-dialog-content.png b/forui/test/golden/dialog/zinc-dark-Axis.horizontal-text-dialog-content.png index 6e0bac4d3..4558c75c6 100644 Binary files a/forui/test/golden/dialog/zinc-dark-Axis.horizontal-text-dialog-content.png and b/forui/test/golden/dialog/zinc-dark-Axis.horizontal-text-dialog-content.png differ diff --git a/forui/test/golden/dialog/zinc-dark-Axis.vertical-raw-dialog-content.png b/forui/test/golden/dialog/zinc-dark-Axis.vertical-raw-dialog-content.png index f0150b091..ad2e6080a 100644 Binary files a/forui/test/golden/dialog/zinc-dark-Axis.vertical-raw-dialog-content.png and b/forui/test/golden/dialog/zinc-dark-Axis.vertical-raw-dialog-content.png differ diff --git a/forui/test/golden/dialog/zinc-dark-Axis.vertical-text-dialog-content.png b/forui/test/golden/dialog/zinc-dark-Axis.vertical-text-dialog-content.png index f0150b091..ad2e6080a 100644 Binary files a/forui/test/golden/dialog/zinc-dark-Axis.vertical-text-dialog-content.png and b/forui/test/golden/dialog/zinc-dark-Axis.vertical-text-dialog-content.png differ diff --git a/forui/test/golden/dialog/zinc-light-Axis.horizontal-raw-dialog-content.png b/forui/test/golden/dialog/zinc-light-Axis.horizontal-raw-dialog-content.png index ba9a0b1f9..360a4b851 100644 Binary files a/forui/test/golden/dialog/zinc-light-Axis.horizontal-raw-dialog-content.png and b/forui/test/golden/dialog/zinc-light-Axis.horizontal-raw-dialog-content.png differ diff --git a/forui/test/golden/dialog/zinc-light-Axis.horizontal-text-dialog-content.png b/forui/test/golden/dialog/zinc-light-Axis.horizontal-text-dialog-content.png index ba9a0b1f9..360a4b851 100644 Binary files a/forui/test/golden/dialog/zinc-light-Axis.horizontal-text-dialog-content.png and b/forui/test/golden/dialog/zinc-light-Axis.horizontal-text-dialog-content.png differ diff --git a/forui/test/golden/dialog/zinc-light-Axis.vertical-raw-dialog-content.png b/forui/test/golden/dialog/zinc-light-Axis.vertical-raw-dialog-content.png index 8a0c8c260..c3596ee8d 100644 Binary files a/forui/test/golden/dialog/zinc-light-Axis.vertical-raw-dialog-content.png and b/forui/test/golden/dialog/zinc-light-Axis.vertical-raw-dialog-content.png differ diff --git a/forui/test/golden/dialog/zinc-light-Axis.vertical-text-dialog-content.png b/forui/test/golden/dialog/zinc-light-Axis.vertical-text-dialog-content.png index 8a0c8c260..c3596ee8d 100644 Binary files a/forui/test/golden/dialog/zinc-light-Axis.vertical-text-dialog-content.png and b/forui/test/golden/dialog/zinc-light-Axis.vertical-text-dialog-content.png differ diff --git a/forui/test/golden/header/zinc-dark-header.png b/forui/test/golden/header/zinc-dark-header.png index a99ee2519..67d60b833 100644 Binary files a/forui/test/golden/header/zinc-dark-header.png and b/forui/test/golden/header/zinc-dark-header.png differ diff --git a/forui/test/golden/header/zinc-dark-raw-title.png b/forui/test/golden/header/zinc-dark-raw-title.png index 72dcab638..5aa4d358b 100644 Binary files a/forui/test/golden/header/zinc-dark-raw-title.png and b/forui/test/golden/header/zinc-dark-raw-title.png differ diff --git a/forui/test/golden/header/zinc-light-header.png b/forui/test/golden/header/zinc-light-header.png index eea9fcee0..58cf6863f 100644 Binary files a/forui/test/golden/header/zinc-light-header.png and b/forui/test/golden/header/zinc-light-header.png differ diff --git a/forui/test/golden/header/zinc-light-raw-title.png b/forui/test/golden/header/zinc-light-raw-title.png index 753eab311..70090d4bc 100644 Binary files a/forui/test/golden/header/zinc-light-raw-title.png and b/forui/test/golden/header/zinc-light-raw-title.png differ diff --git a/forui/test/golden/text_field/default-zinc-dark-focused-no-text.png b/forui/test/golden/text_field/default-zinc-dark-focused-no-text.png index a0971e19b..df7216740 100644 Binary files a/forui/test/golden/text_field/default-zinc-dark-focused-no-text.png and b/forui/test/golden/text_field/default-zinc-dark-focused-no-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-dark-focused-raw-text.png b/forui/test/golden/text_field/default-zinc-dark-focused-raw-text.png index a2e0127be..e1e23653e 100644 Binary files a/forui/test/golden/text_field/default-zinc-dark-focused-raw-text.png and b/forui/test/golden/text_field/default-zinc-dark-focused-raw-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-dark-focused-text.png b/forui/test/golden/text_field/default-zinc-dark-focused-text.png index 25faae303..a5a36d426 100644 Binary files a/forui/test/golden/text_field/default-zinc-dark-focused-text.png and b/forui/test/golden/text_field/default-zinc-dark-focused-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-dark-unfocused-no-text.png b/forui/test/golden/text_field/default-zinc-dark-unfocused-no-text.png index 8e7b13fa4..8719adb9f 100644 Binary files a/forui/test/golden/text_field/default-zinc-dark-unfocused-no-text.png and b/forui/test/golden/text_field/default-zinc-dark-unfocused-no-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-dark-unfocused-raw-text.png b/forui/test/golden/text_field/default-zinc-dark-unfocused-raw-text.png index 7a1e46320..3c5610f57 100644 Binary files a/forui/test/golden/text_field/default-zinc-dark-unfocused-raw-text.png and b/forui/test/golden/text_field/default-zinc-dark-unfocused-raw-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-dark-unfocused-text.png b/forui/test/golden/text_field/default-zinc-dark-unfocused-text.png index bad7d3367..65c2fb5b8 100644 Binary files a/forui/test/golden/text_field/default-zinc-dark-unfocused-text.png and b/forui/test/golden/text_field/default-zinc-dark-unfocused-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-light-focused-no-text.png b/forui/test/golden/text_field/default-zinc-light-focused-no-text.png index 22095100a..ca9e8f9db 100644 Binary files a/forui/test/golden/text_field/default-zinc-light-focused-no-text.png and b/forui/test/golden/text_field/default-zinc-light-focused-no-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-light-focused-raw-text.png b/forui/test/golden/text_field/default-zinc-light-focused-raw-text.png index 95870e393..53d6e6956 100644 Binary files a/forui/test/golden/text_field/default-zinc-light-focused-raw-text.png and b/forui/test/golden/text_field/default-zinc-light-focused-raw-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-light-focused-text.png b/forui/test/golden/text_field/default-zinc-light-focused-text.png index 63b5fc75e..3f5153450 100644 Binary files a/forui/test/golden/text_field/default-zinc-light-focused-text.png and b/forui/test/golden/text_field/default-zinc-light-focused-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-light-unfocused-no-text.png b/forui/test/golden/text_field/default-zinc-light-unfocused-no-text.png index f8447c986..75e61a4b3 100644 Binary files a/forui/test/golden/text_field/default-zinc-light-unfocused-no-text.png and b/forui/test/golden/text_field/default-zinc-light-unfocused-no-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-light-unfocused-raw-text.png b/forui/test/golden/text_field/default-zinc-light-unfocused-raw-text.png index c0a0eb39b..055e84d17 100644 Binary files a/forui/test/golden/text_field/default-zinc-light-unfocused-raw-text.png and b/forui/test/golden/text_field/default-zinc-light-unfocused-raw-text.png differ diff --git a/forui/test/golden/text_field/default-zinc-light-unfocused-text.png b/forui/test/golden/text_field/default-zinc-light-unfocused-text.png index aa94e58e3..4285cb9c5 100644 Binary files a/forui/test/golden/text_field/default-zinc-light-unfocused-text.png and b/forui/test/golden/text_field/default-zinc-light-unfocused-text.png differ diff --git a/forui/test/golden/text_field/email-zinc-dark-focused-no-text.png b/forui/test/golden/text_field/email-zinc-dark-focused-no-text.png index 414170fea..a8766fa44 100644 Binary files a/forui/test/golden/text_field/email-zinc-dark-focused-no-text.png and b/forui/test/golden/text_field/email-zinc-dark-focused-no-text.png differ diff --git a/forui/test/golden/text_field/email-zinc-dark-focused-text.png b/forui/test/golden/text_field/email-zinc-dark-focused-text.png index c1b8e08bf..fe940ee26 100644 Binary files a/forui/test/golden/text_field/email-zinc-dark-focused-text.png and b/forui/test/golden/text_field/email-zinc-dark-focused-text.png differ diff --git a/forui/test/golden/text_field/email-zinc-dark-unfocused-no-text.png b/forui/test/golden/text_field/email-zinc-dark-unfocused-no-text.png index 45bb933c1..bc90b17fb 100644 Binary files a/forui/test/golden/text_field/email-zinc-dark-unfocused-no-text.png and b/forui/test/golden/text_field/email-zinc-dark-unfocused-no-text.png differ diff --git a/forui/test/golden/text_field/email-zinc-dark-unfocused-text.png b/forui/test/golden/text_field/email-zinc-dark-unfocused-text.png index 2f646e22e..e534fcd91 100644 Binary files a/forui/test/golden/text_field/email-zinc-dark-unfocused-text.png and b/forui/test/golden/text_field/email-zinc-dark-unfocused-text.png differ diff --git a/forui/test/golden/text_field/email-zinc-light-focused-no-text.png b/forui/test/golden/text_field/email-zinc-light-focused-no-text.png index b6f6a3cc2..a5326f8c4 100644 Binary files a/forui/test/golden/text_field/email-zinc-light-focused-no-text.png and b/forui/test/golden/text_field/email-zinc-light-focused-no-text.png differ diff --git a/forui/test/golden/text_field/email-zinc-light-focused-text.png b/forui/test/golden/text_field/email-zinc-light-focused-text.png index 284dbc672..2d7206399 100644 Binary files a/forui/test/golden/text_field/email-zinc-light-focused-text.png and b/forui/test/golden/text_field/email-zinc-light-focused-text.png differ diff --git a/forui/test/golden/text_field/email-zinc-light-unfocused-no-text.png b/forui/test/golden/text_field/email-zinc-light-unfocused-no-text.png index 6e04cf61b..158e091a3 100644 Binary files a/forui/test/golden/text_field/email-zinc-light-unfocused-no-text.png and b/forui/test/golden/text_field/email-zinc-light-unfocused-no-text.png differ diff --git a/forui/test/golden/text_field/email-zinc-light-unfocused-text.png b/forui/test/golden/text_field/email-zinc-light-unfocused-text.png index 5172c1229..cf22a7ed7 100644 Binary files a/forui/test/golden/text_field/email-zinc-light-unfocused-text.png and b/forui/test/golden/text_field/email-zinc-light-unfocused-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-dark-focused-no-text.png b/forui/test/golden/text_field/error-zinc-dark-focused-no-text.png index f37078e31..719fb52b6 100644 Binary files a/forui/test/golden/text_field/error-zinc-dark-focused-no-text.png and b/forui/test/golden/text_field/error-zinc-dark-focused-no-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-dark-focused-raw-text.png b/forui/test/golden/text_field/error-zinc-dark-focused-raw-text.png index 2dcc9ea3c..89e13da48 100644 Binary files a/forui/test/golden/text_field/error-zinc-dark-focused-raw-text.png and b/forui/test/golden/text_field/error-zinc-dark-focused-raw-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-dark-focused-text.png b/forui/test/golden/text_field/error-zinc-dark-focused-text.png index d850eab0e..c13339ece 100644 Binary files a/forui/test/golden/text_field/error-zinc-dark-focused-text.png and b/forui/test/golden/text_field/error-zinc-dark-focused-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-dark-unfocused-no-text.png b/forui/test/golden/text_field/error-zinc-dark-unfocused-no-text.png index 595def582..aa9dc5d10 100644 Binary files a/forui/test/golden/text_field/error-zinc-dark-unfocused-no-text.png and b/forui/test/golden/text_field/error-zinc-dark-unfocused-no-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-dark-unfocused-raw-text.png b/forui/test/golden/text_field/error-zinc-dark-unfocused-raw-text.png index c8784e4c8..6d30d592e 100644 Binary files a/forui/test/golden/text_field/error-zinc-dark-unfocused-raw-text.png and b/forui/test/golden/text_field/error-zinc-dark-unfocused-raw-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-dark-unfocused-text.png b/forui/test/golden/text_field/error-zinc-dark-unfocused-text.png index 92a1cb6e8..be449fc83 100644 Binary files a/forui/test/golden/text_field/error-zinc-dark-unfocused-text.png and b/forui/test/golden/text_field/error-zinc-dark-unfocused-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-light-focused-no-text.png b/forui/test/golden/text_field/error-zinc-light-focused-no-text.png index 61ec8378d..e717b0c76 100644 Binary files a/forui/test/golden/text_field/error-zinc-light-focused-no-text.png and b/forui/test/golden/text_field/error-zinc-light-focused-no-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-light-focused-raw-text.png b/forui/test/golden/text_field/error-zinc-light-focused-raw-text.png index a5bb434a2..55d0d672c 100644 Binary files a/forui/test/golden/text_field/error-zinc-light-focused-raw-text.png and b/forui/test/golden/text_field/error-zinc-light-focused-raw-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-light-focused-text.png b/forui/test/golden/text_field/error-zinc-light-focused-text.png index 465cae999..dd90350bb 100644 Binary files a/forui/test/golden/text_field/error-zinc-light-focused-text.png and b/forui/test/golden/text_field/error-zinc-light-focused-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-light-unfocused-no-text.png b/forui/test/golden/text_field/error-zinc-light-unfocused-no-text.png index 83125d37f..46c86b8d1 100644 Binary files a/forui/test/golden/text_field/error-zinc-light-unfocused-no-text.png and b/forui/test/golden/text_field/error-zinc-light-unfocused-no-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-light-unfocused-raw-text.png b/forui/test/golden/text_field/error-zinc-light-unfocused-raw-text.png index b0b0f3240..77ad0e4bc 100644 Binary files a/forui/test/golden/text_field/error-zinc-light-unfocused-raw-text.png and b/forui/test/golden/text_field/error-zinc-light-unfocused-raw-text.png differ diff --git a/forui/test/golden/text_field/error-zinc-light-unfocused-text.png b/forui/test/golden/text_field/error-zinc-light-unfocused-text.png index b871a892d..74ed0f72c 100644 Binary files a/forui/test/golden/text_field/error-zinc-light-unfocused-text.png and b/forui/test/golden/text_field/error-zinc-light-unfocused-text.png differ diff --git a/forui/test/golden/text_field/multiline-zinc-dark-focused-no-text.png b/forui/test/golden/text_field/multiline-zinc-dark-focused-no-text.png index 6c64bd7f5..8c53bf32f 100644 Binary files a/forui/test/golden/text_field/multiline-zinc-dark-focused-no-text.png and b/forui/test/golden/text_field/multiline-zinc-dark-focused-no-text.png differ diff --git a/forui/test/golden/text_field/multiline-zinc-dark-focused-text.png b/forui/test/golden/text_field/multiline-zinc-dark-focused-text.png index daa675dd7..17ece5b32 100644 Binary files a/forui/test/golden/text_field/multiline-zinc-dark-focused-text.png and b/forui/test/golden/text_field/multiline-zinc-dark-focused-text.png differ diff --git a/forui/test/golden/text_field/multiline-zinc-dark-unfocused-no-text.png b/forui/test/golden/text_field/multiline-zinc-dark-unfocused-no-text.png index 1928d1fa4..2a5f35f50 100644 Binary files a/forui/test/golden/text_field/multiline-zinc-dark-unfocused-no-text.png and b/forui/test/golden/text_field/multiline-zinc-dark-unfocused-no-text.png differ diff --git a/forui/test/golden/text_field/multiline-zinc-dark-unfocused-text.png b/forui/test/golden/text_field/multiline-zinc-dark-unfocused-text.png index fa3b77738..8c2ff5842 100644 Binary files a/forui/test/golden/text_field/multiline-zinc-dark-unfocused-text.png and b/forui/test/golden/text_field/multiline-zinc-dark-unfocused-text.png differ diff --git a/forui/test/golden/text_field/multiline-zinc-light-focused-no-text.png b/forui/test/golden/text_field/multiline-zinc-light-focused-no-text.png index 1f9fcf650..52dccb3da 100644 Binary files a/forui/test/golden/text_field/multiline-zinc-light-focused-no-text.png and b/forui/test/golden/text_field/multiline-zinc-light-focused-no-text.png differ diff --git a/forui/test/golden/text_field/multiline-zinc-light-focused-text.png b/forui/test/golden/text_field/multiline-zinc-light-focused-text.png index 0f34bef89..884a834a1 100644 Binary files a/forui/test/golden/text_field/multiline-zinc-light-focused-text.png and b/forui/test/golden/text_field/multiline-zinc-light-focused-text.png differ diff --git a/forui/test/golden/text_field/multiline-zinc-light-unfocused-no-text.png b/forui/test/golden/text_field/multiline-zinc-light-unfocused-no-text.png index 3ec65d60b..a696e5454 100644 Binary files a/forui/test/golden/text_field/multiline-zinc-light-unfocused-no-text.png and b/forui/test/golden/text_field/multiline-zinc-light-unfocused-no-text.png differ diff --git a/forui/test/golden/text_field/multiline-zinc-light-unfocused-text.png b/forui/test/golden/text_field/multiline-zinc-light-unfocused-text.png index 4c06afe80..db22901dc 100644 Binary files a/forui/test/golden/text_field/multiline-zinc-light-unfocused-text.png and b/forui/test/golden/text_field/multiline-zinc-light-unfocused-text.png differ diff --git a/forui/test/golden/text_field/password-zinc-dark-focused-no-text.png b/forui/test/golden/text_field/password-zinc-dark-focused-no-text.png index db10bf479..a57679ba5 100644 Binary files a/forui/test/golden/text_field/password-zinc-dark-focused-no-text.png and b/forui/test/golden/text_field/password-zinc-dark-focused-no-text.png differ diff --git a/forui/test/golden/text_field/password-zinc-dark-focused-text.png b/forui/test/golden/text_field/password-zinc-dark-focused-text.png index fe5196125..c20569ebd 100644 Binary files a/forui/test/golden/text_field/password-zinc-dark-focused-text.png and b/forui/test/golden/text_field/password-zinc-dark-focused-text.png differ diff --git a/forui/test/golden/text_field/password-zinc-dark-unfocused-no-text.png b/forui/test/golden/text_field/password-zinc-dark-unfocused-no-text.png index 9bf104208..edab691ec 100644 Binary files a/forui/test/golden/text_field/password-zinc-dark-unfocused-no-text.png and b/forui/test/golden/text_field/password-zinc-dark-unfocused-no-text.png differ diff --git a/forui/test/golden/text_field/password-zinc-dark-unfocused-text.png b/forui/test/golden/text_field/password-zinc-dark-unfocused-text.png index 9f31ef685..145614a3f 100644 Binary files a/forui/test/golden/text_field/password-zinc-dark-unfocused-text.png and b/forui/test/golden/text_field/password-zinc-dark-unfocused-text.png differ diff --git a/forui/test/golden/text_field/password-zinc-light-focused-no-text.png b/forui/test/golden/text_field/password-zinc-light-focused-no-text.png index 74384304c..948c48fb2 100644 Binary files a/forui/test/golden/text_field/password-zinc-light-focused-no-text.png and b/forui/test/golden/text_field/password-zinc-light-focused-no-text.png differ diff --git a/forui/test/golden/text_field/password-zinc-light-focused-text.png b/forui/test/golden/text_field/password-zinc-light-focused-text.png index 30f3620f9..c1a8c6093 100644 Binary files a/forui/test/golden/text_field/password-zinc-light-focused-text.png and b/forui/test/golden/text_field/password-zinc-light-focused-text.png differ diff --git a/forui/test/golden/text_field/password-zinc-light-unfocused-no-text.png b/forui/test/golden/text_field/password-zinc-light-unfocused-no-text.png index ca5a86653..b12453454 100644 Binary files a/forui/test/golden/text_field/password-zinc-light-unfocused-no-text.png and b/forui/test/golden/text_field/password-zinc-light-unfocused-no-text.png differ diff --git a/forui/test/golden/text_field/password-zinc-light-unfocused-text.png b/forui/test/golden/text_field/password-zinc-light-unfocused-text.png index 9ea182b1e..37b7b43a8 100644 Binary files a/forui/test/golden/text_field/password-zinc-light-unfocused-text.png and b/forui/test/golden/text_field/password-zinc-light-unfocused-text.png differ