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

Unified Diff: third_party/polymer/v0_8/components/paper-styles/typography.html

Issue 1162563004: Upgrade to 1.0 and switch clients to dom-repeat where needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a layout import and remove the gzipped webanimation in reproduce.sh Created 5 years, 7 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
Index: third_party/polymer/v0_8/components/paper-styles/typography.html
diff --git a/third_party/polymer/v0_8/components/paper-styles/typography.html b/third_party/polymer/v0_8/components/paper-styles/typography.html
index aae1a94afc2c226ba5bea900f5a7d440f128d694..a37cd3408fea687fe502c79f810e35906cb7fc90 100644
--- a/third_party/polymer/v0_8/components/paper-styles/typography.html
+++ b/third_party/polymer/v0_8/components/paper-styles/typography.html
@@ -12,9 +12,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<link rel="import" href="../polymer/polymer.html">
-<style is="x-style">
+<style is="custom-style">
- * {
+ :root {
/* Shared Styles */
@@ -25,33 +25,33 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
--paper-font-common-base: {
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- }
+ };
--paper-font-common-code: {
font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace;
-webkit-font-smoothing: antialiased;
- }
+ };
--paper-font-common-expensive-kerning: {
text-rendering: optimizeLegibility;
- }
+ };
--paper-font-common-nowrap: {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- }
+ };
*/
/* Material Font Styles */
--paper-font-display4: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- /* mixin(--paper-font-common-expensive-kerning); */
+ /* @apply(--paper-font-common-expensive-kerning); */
text-rendering: optimizeLegibility;
- /* mixin(--paper-font-common-nowrap); */
+ /* @apply(--paper-font-common-nowrap); */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -60,15 +60,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
font-weight: 300;
letter-spacing: -.044em;
line-height: 120px;
- }
+ };
--paper-font-display3: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- /* mixin(--paper-font-common-expensive-kerning); */
+ /* @apply(--paper-font-common-expensive-kerning); */
text-rendering: optimizeLegibility;
- /* mixin(--paper-font-common-nowrap); */
+ /* @apply(--paper-font-common-nowrap); */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -77,54 +77,54 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
font-weight: 400;
letter-spacing: -.026em;
line-height: 60px;
- }
+ };
--paper-font-display2: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- /* mixin(--paper-font-common-expensive-kerning); */
+ /* @apply(--paper-font-common-expensive-kerning); */
text-rendering: optimizeLegibility;
font-size: 45px;
font-weight: 400;
letter-spacing: -.018em;
line-height: 48px;
- }
+ };
--paper-font-display1: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- /* mixin(--paper-font-common-expensive-kerning); */
+ /* @apply(--paper-font-common-expensive-kerning); */
text-rendering: optimizeLegibility;
font-size: 34px;
font-weight: 400;
letter-spacing: -.01em;
line-height: 40px;
- }
+ };
--paper-font-headline: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- /* mixin(--paper-font-common-expensive-kerning); */
+ /* @apply(--paper-font-common-expensive-kerning); */
text-rendering: optimizeLegibility;
font-size: 24px;
font-weight: 400;
letter-spacing: -.012em;
line-height: 32px;
- }
+ };
--paper-font-title: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- /* mixin(--paper-font-common-expensive-kerning); */
+ /* @apply(--paper-font-common-expensive-kerning); */
text-rendering: optimizeLegibility;
- /* mixin(--paper-font-common-nowrap); */
+ /* @apply(--paper-font-common-nowrap); */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -132,45 +132,45 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
font-size: 20px;
font-weight: 500;
line-height: 28px;
- }
+ };
--paper-font-subhead: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- /* mixin(--paper-font-common-expensive-kerning); */
+ /* @apply(--paper-font-common-expensive-kerning); */
text-rendering: optimizeLegibility;
font-size: 16px;
font-weight: 400;
line-height: 24px;
- }
+ };
--paper-font-body2: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
font-size: 14px;
font-weight: 500;
line-height: 24px;
- }
+ };
--paper-font-body1: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
font-size: 14px;
font-weight: 400;
line-height: 20px;
- }
+ };
--paper-font-caption: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- /* mixin(--paper-font-common-nowrap); */
+ /* @apply(--paper-font-common-nowrap); */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -179,15 +179,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
font-weight: 400;
letter-spacing: 0.011em;
line-height: 20px;
- }
+ };
--paper-font-menu: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- /* mixin(--paper-font-common-expensive-kerning); */
+ /* @apply(--paper-font-common-expensive-kerning); */
text-rendering: optimizeLegibility;
- /* mixin(--paper-font-common-nowrap); */
+ /* @apply(--paper-font-common-nowrap); */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -195,15 +195,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
font-size: 13px;
font-weight: 500;
line-height: 24px;
- }
+ };
--paper-font-button: {
- /* mixin(--paper-font-common-base) */
+ /* @apply(--paper-font-common-base) */
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
- /* mixin(--paper-font-common-expensive-kerning); */
+ /* @apply(--paper-font-common-expensive-kerning); */
text-rendering: optimizeLegibility;
- /* mixin(--paper-font-common-nowrap); */
+ /* @apply(--paper-font-common-nowrap); */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -213,27 +213,27 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
letter-spacing: 0.018em;
line-height: 24px;
text-transform: uppercase;
- }
+ };
--paper-font-code2: {
- /* mixin(--paper-font-common-code); */
+ /* @apply(--paper-font-common-code); */
font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace;
-webkit-font-smoothing: antialiased;
font-size: 14px;
font-weight: 700;
line-height: 20px;
- }
+ };
--paper-font-code1: {
- /* mixin(--paper-font-common-code); */
+ /* @apply(--paper-font-common-code); */
font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace;
-webkit-font-smoothing: antialiased;
font-size: 14px;
font-weight: 500;
line-height: 20px;
- }
+ };
}

Powered by Google App Engine
This is Rietveld 408576698