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

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

Issue 1221923003: Update bower.json for Polymer elements and add PRESUBMIT.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 5 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/v1_0/components/paper-styles/typography.html
diff --git a/third_party/polymer/v1_0/components/paper-styles/typography.html b/third_party/polymer/v1_0/components/paper-styles/typography.html
index a37cd3408fea687fe502c79f810e35906cb7fc90..ce78602da92088ddedf24e223cb2dc2e5626cc64 100644
--- a/third_party/polymer/v1_0/components/paper-styles/typography.html
+++ b/third_party/polymer/v1_0/components/paper-styles/typography.html
@@ -7,10 +7,9 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
-<!-- TODO(nevir): Should we upgrade Polymer/font-roboto to the final font? -->
-<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,300,300italic,400italic,500,500italic,700,700italic">
<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../font-roboto/roboto.html">
<style is="custom-style">
@@ -19,16 +18,16 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
/* Shared Styles */
/*
- Unfortunately, we can't make use of these yet - sibling properties aren't
- evaluated. See https://github.com/Polymer/polymer/issues/1399
-
+ 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;
};
--paper-font-common-code: {
- font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace;
+ font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
-webkit-font-smoothing: antialiased;
};
@@ -41,7 +40,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
overflow: hidden;
text-overflow: ellipsis;
};
- */
/* Material Font Styles */
@@ -217,7 +215,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: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace;
+ font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
-webkit-font-smoothing: antialiased;
font-size: 14px;
@@ -227,7 +225,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: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace;
+ font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
-webkit-font-smoothing: antialiased;
font-size: 14px;

Powered by Google App Engine
This is Rietveld 408576698