Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(448)

Unified Diff: sky/sdk/lib/theme/typography.dart

Issue 1217573003: Fix all the components to pick the right colours from the theme. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/sdk/lib/painting/text_style.dart ('k') | sky/sdk/lib/widgets/drawer_header.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/sdk/lib/theme/typography.dart
diff --git a/sky/sdk/lib/theme/typography.dart b/sky/sdk/lib/theme/typography.dart
index 1cce6761aab49fb32477a8a8e5ac20e931138d72..5e1d114f03d385a1d9415a1c033b1995d389109b 100644
--- a/sky/sdk/lib/theme/typography.dart
+++ b/sky/sdk/lib/theme/typography.dart
@@ -14,13 +14,13 @@ class TextTheme {
TextTheme._(Color color54, Color color87)
: display4 = new TextStyle(fontSize: 112.0, fontWeight: FontWeight.w100, color: color54),
display3 = new TextStyle(fontSize: 56.0, fontWeight: FontWeight.w400, color: color54),
- display2 = new TextStyle(fontSize: 45.0, fontWeight: FontWeight.w400, color: color54),
- display1 = new TextStyle(fontSize: 34.0, fontWeight: FontWeight.w400, color: color54),
- headline = new TextStyle(fontSize: 24.0, fontWeight: FontWeight.w400, color: color87),
- title = new TextStyle(fontSize: 20.0, fontWeight: FontWeight.w500, color: color87),
- subhead = new TextStyle(fontSize: 16.0, fontWeight: FontWeight.w400, color: color87),
- body2 = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w500, color: color87),
- body1 = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w400, color: color87),
+ display2 = new TextStyle(fontSize: 45.0, fontWeight: FontWeight.w400, color: color54, height: 48.0 / 45.0),
+ display1 = new TextStyle(fontSize: 34.0, fontWeight: FontWeight.w400, color: color54, height: 40.0 / 34.0),
+ headline = new TextStyle(fontSize: 24.0, fontWeight: FontWeight.w400, color: color87, height: 32.0 / 24.0),
+ title = new TextStyle(fontSize: 20.0, fontWeight: FontWeight.w500, color: color87, height: 28.0 / 20.0),
+ subhead = new TextStyle(fontSize: 16.0, fontWeight: FontWeight.w400, color: color87, height: 24.0 / 16.0),
+ body2 = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w500, color: color87, height: 24.0 / 14.0),
+ body1 = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w400, color: color87, height: 20.0 / 14.0),
caption = new TextStyle(fontSize: 12.0, fontWeight: FontWeight.w400, color: color54),
button = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w500, color: color87);
@@ -51,3 +51,15 @@ final TextTheme white = new TextTheme._(
// TODO(abarth): Maybe this should be hard-coded in Scaffold?
const String typeface = 'font-family: sans-serif';
+
+const TextStyle error = const TextStyle(
+ color: const Color(0xD0FF0000),
+ fontFamily: 'monospace',
+ fontSize: 48.0,
+ fontWeight: FontWeight.w900,
+ textAlign: TextAlign.right,
+ decoration: underline,
+ decorationColor: const Color(0xFFFF00),
+ decorationStyle: TextDecorationStyle.double
+);
+
« no previous file with comments | « sky/sdk/lib/painting/text_style.dart ('k') | sky/sdk/lib/widgets/drawer_header.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698