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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1561893002: [Polymer] Roll polymer to latest version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update grdp Created 4 years, 11 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 | « third_party/polymer/v1_0/components-chromium/paper-styles/demo-pages.html ('k') | third_party/polymer/v1_0/components-chromium/paper-toggle-button/.bower.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/polymer/v1_0/components-chromium/paper-styles/typography.html
diff --git a/third_party/polymer/v1_0/components-chromium/paper-styles/typography.html b/third_party/polymer/v1_0/components-chromium/paper-styles/typography.html
index 4a599f872aae8c935aceb388d53938caa0841901..055b5f99ce653642c615445416b31b3413d27e07 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-styles/typography.html
+++ b/third_party/polymer/v1_0/components-chromium/paper-styles/typography.html
@@ -16,11 +16,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
:root {
/* Shared Styles */
-
- /*
- Unfortunately, we can't use nested rules
- See https://github.com/Polymer/polymer/issues/1399
- */
--paper-font-common-base: {
font-family: 'Roboto', 'Noto', sans-serif;
-webkit-font-smoothing: antialiased;
@@ -44,14 +39,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
/* Material Font Styles */
--paper-font-display4: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
-
- /* @apply(--paper-font-common-nowrap); */
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @apply(--paper-font-common-base);
+ @apply(--paper-font-common-nowrap);
font-size: 112px;
font-weight: 300;
@@ -60,14 +49,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-display3: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
-
- /* @apply(--paper-font-common-nowrap); */
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @apply(--paper-font-common-base);
+ @apply(--paper-font-common-nowrap);
font-size: 56px;
font-weight: 400;
@@ -76,10 +59,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-display2: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
-
+ @apply(--paper-font-common-base);
font-size: 45px;
font-weight: 400;
@@ -88,10 +68,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-display1: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
-
+ @apply(--paper-font-common-base);
font-size: 34px;
font-weight: 400;
@@ -100,10 +77,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-headline: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
-
+ @apply(--paper-font-common-base);
font-size: 24px;
font-weight: 400;
@@ -112,14 +86,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-title: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
-
- /* @apply(--paper-font-common-nowrap); */
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @apply(--paper-font-common-base);
+ @apply(--paper-font-common-nowrap);
font-size: 20px;
font-weight: 500;
@@ -127,10 +95,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-subhead: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
-
+ @apply(--paper-font-common-base);
font-size: 16px;
font-weight: 400;
@@ -138,9 +103,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-body2: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
+ @apply(--paper-font-common-base);
font-size: 14px;
font-weight: 500;
@@ -148,9 +111,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-body1: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
+ @apply(--paper-font-common-base);
font-size: 14px;
font-weight: 400;
@@ -158,13 +119,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-caption: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
- /* @apply(--paper-font-common-nowrap); */
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @apply(--paper-font-common-base);
+ @apply(--paper-font-common-nowrap);
font-size: 12px;
font-weight: 400;
@@ -173,14 +129,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-menu: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
-
- /* @apply(--paper-font-common-nowrap); */
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @apply(--paper-font-common-base);
+ @apply(--paper-font-common-nowrap);
font-size: 13px;
font-weight: 500;
@@ -188,14 +138,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-button: {
- /* @apply(--paper-font-common-base) */
- font-family: 'Roboto', 'Noto', sans-serif;
- -webkit-font-smoothing: antialiased;
-
- /* @apply(--paper-font-common-nowrap); */
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @apply(--paper-font-common-base);
+ @apply(--paper-font-common-nowrap);
font-size: 14px;
font-weight: 500;
@@ -205,9 +149,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-code2: {
- /* @apply(--paper-font-common-code); */
- font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
- -webkit-font-smoothing: antialiased;
+ @apply(--paper-font-common-code);
font-size: 14px;
font-weight: 700;
@@ -215,9 +157,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
};
--paper-font-code1: {
- /* @apply(--paper-font-common-code); */
- font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
- -webkit-font-smoothing: antialiased;
+ @apply(--paper-font-common-code);
font-size: 14px;
font-weight: 500;
« no previous file with comments | « third_party/polymer/v1_0/components-chromium/paper-styles/demo-pages.html ('k') | third_party/polymer/v1_0/components-chromium/paper-toggle-button/.bower.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698