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

Side by Side Diff: third_party/polymer/v1_0/components-chromium/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 unified diff | Download patch
OLDNEW
1 <!-- 1 <!--
2 @license 2 @license
3 Copyright (c) 2015 The Polymer Project Authors. All rights reserved. 3 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
4 This code may only be used under the BSD style license found at http://polymer.g ithub.io/LICENSE.txt 4 This code may only be used under the BSD style license found at http://polymer.g ithub.io/LICENSE.txt
5 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt 5 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
6 The complete set of contributors may be found at http://polymer.github.io/CONTRI BUTORS.txt 6 The complete set of contributors may be found at http://polymer.github.io/CONTRI BUTORS.txt
7 Code distributed by Google as part of the polymer project is also 7 Code distributed by Google as part of the polymer project is also
8 subject to an additional IP rights grant found at http://polymer.github.io/PATEN TS.txt 8 subject to an additional IP rights grant found at http://polymer.github.io/PATEN TS.txt
9 --> 9 -->
10 <!-- TODO(nevir): Should we upgrade Polymer/font-roboto to the final font? -->
11 <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,300,30 0italic,400italic,500,500italic,700,700italic">
12 10
13 <link rel="import" href="../polymer/polymer.html"> 11 <link rel="import" href="../polymer/polymer.html">
12 <link rel="import" href="../font-roboto/roboto.html">
14 13
15 <style is="custom-style"> 14 <style is="custom-style">
16 15
17 :root { 16 :root {
18 17
19 /* Shared Styles */ 18 /* Shared Styles */
20 19
21 /* 20 /*
22 Unfortunately, we can't make use of these yet - sibling properties aren't 21 Unfortunately, we can't use nested rules
23 evaluated. See https://github.com/Polymer/polymer/issues/1399 22 See https://github.com/Polymer/polymer/issues/1399
24 23 */
25 --paper-font-common-base: { 24 --paper-font-common-base: {
26 font-family: 'Roboto', 'Noto', sans-serif; 25 font-family: 'Roboto', 'Noto', sans-serif;
27 -webkit-font-smoothing: antialiased; 26 -webkit-font-smoothing: antialiased;
28 }; 27 };
29 28
30 --paper-font-common-code: { 29 --paper-font-common-code: {
31 font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menl o', monospace; 30 font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
32 -webkit-font-smoothing: antialiased; 31 -webkit-font-smoothing: antialiased;
33 }; 32 };
34 33
35 --paper-font-common-expensive-kerning: { 34 --paper-font-common-expensive-kerning: {
36 text-rendering: optimizeLegibility; 35 text-rendering: optimizeLegibility;
37 }; 36 };
38 37
39 --paper-font-common-nowrap: { 38 --paper-font-common-nowrap: {
40 white-space: nowrap; 39 white-space: nowrap;
41 overflow: hidden; 40 overflow: hidden;
42 text-overflow: ellipsis; 41 text-overflow: ellipsis;
43 }; 42 };
44 */
45 43
46 /* Material Font Styles */ 44 /* Material Font Styles */
47 45
48 --paper-font-display4: { 46 --paper-font-display4: {
49 /* @apply(--paper-font-common-base) */ 47 /* @apply(--paper-font-common-base) */
50 font-family: 'Roboto', 'Noto', sans-serif; 48 font-family: 'Roboto', 'Noto', sans-serif;
51 -webkit-font-smoothing: antialiased; 49 -webkit-font-smoothing: antialiased;
52 /* @apply(--paper-font-common-expensive-kerning); */ 50 /* @apply(--paper-font-common-expensive-kerning); */
53 text-rendering: optimizeLegibility; 51 text-rendering: optimizeLegibility;
54 /* @apply(--paper-font-common-nowrap); */ 52 /* @apply(--paper-font-common-nowrap); */
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 208
211 font-size: 14px; 209 font-size: 14px;
212 font-weight: 500; 210 font-weight: 500;
213 letter-spacing: 0.018em; 211 letter-spacing: 0.018em;
214 line-height: 24px; 212 line-height: 24px;
215 text-transform: uppercase; 213 text-transform: uppercase;
216 }; 214 };
217 215
218 --paper-font-code2: { 216 --paper-font-code2: {
219 /* @apply(--paper-font-common-code); */ 217 /* @apply(--paper-font-common-code); */
220 font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menl o', monospace; 218 font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
221 -webkit-font-smoothing: antialiased; 219 -webkit-font-smoothing: antialiased;
222 220
223 font-size: 14px; 221 font-size: 14px;
224 font-weight: 700; 222 font-weight: 700;
225 line-height: 20px; 223 line-height: 20px;
226 }; 224 };
227 225
228 --paper-font-code1: { 226 --paper-font-code1: {
229 /* @apply(--paper-font-common-code); */ 227 /* @apply(--paper-font-common-code); */
230 font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menl o', monospace; 228 font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
231 -webkit-font-smoothing: antialiased; 229 -webkit-font-smoothing: antialiased;
232 230
233 font-size: 14px; 231 font-size: 14px;
234 font-weight: 500; 232 font-weight: 500;
235 line-height: 20px; 233 line-height: 20px;
236 }; 234 };
237 235
238 } 236 }
239 237
240 </style> 238 </style>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698