Commit 311b57be authored by Ian Hickson's avatar Ian Hickson Committed by GitHub

Revert "Revert "nav bar font styles are special, do not inherit (#12578)"" (#12679)

* Revert "roll engine (#12660)"

This reverts commit 048bc5e0.

* Revert "FittedBox RTL (#12662)"

This reverts commit 05a22fe0.

* Revert "Revert "nav bar font styles are special, do not inherit (#12578)" (#12661)"

This reverts commit 662b6684.
parent 7f0d4f4c
......@@ -330,19 +330,19 @@ class _CupertinoPersistentNavigationBar extends StatelessWidget implements Prefe
color: actionsForegroundColor,
);
final Widget styledLeading = leading == null ? null : DefaultTextStyle.merge(
final Widget styledLeading = leading == null ? null : new DefaultTextStyle(
style: actionsStyle,
child: leading,
);
final Widget styledTrailing = trailing == null ? null : DefaultTextStyle.merge(
final Widget styledTrailing = trailing == null ? null : new DefaultTextStyle(
style: actionsStyle,
child: trailing,
);
// Let the middle be black rather than `actionsForegroundColor` in case
// it's a plain text title.
final Widget styledMiddle = middle == null ? null : DefaultTextStyle.merge(
final Widget styledMiddle = middle == null ? null : new DefaultTextStyle(
style: actionsStyle.copyWith(
fontWeight: FontWeight.w600,
letterSpacing: -0.72,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment