| OLD | NEW |
| 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 | 10 |
| 11 <link rel="import" href="../polymer/polymer.html"> | 11 <link rel="import" href="../polymer/polymer.html"> |
| 12 <link rel="import" href="../font-roboto/roboto.html"> | 12 <link rel="import" href="../font-roboto/roboto.html"> |
| 13 | 13 |
| 14 <style is="custom-style"> | 14 <style is="custom-style"> |
| 15 | 15 |
| 16 :root { | 16 :root { |
| 17 | 17 |
| 18 /* Shared Styles */ | 18 /* Shared Styles */ |
| 19 | |
| 20 /* | |
| 21 Unfortunately, we can't use nested rules | |
| 22 See https://github.com/Polymer/polymer/issues/1399 | |
| 23 */ | |
| 24 --paper-font-common-base: { | 19 --paper-font-common-base: { |
| 25 font-family: 'Roboto', 'Noto', sans-serif; | 20 font-family: 'Roboto', 'Noto', sans-serif; |
| 26 -webkit-font-smoothing: antialiased; | 21 -webkit-font-smoothing: antialiased; |
| 27 }; | 22 }; |
| 28 | 23 |
| 29 --paper-font-common-code: { | 24 --paper-font-common-code: { |
| 30 font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace; | 25 font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace; |
| 31 -webkit-font-smoothing: antialiased; | 26 -webkit-font-smoothing: antialiased; |
| 32 }; | 27 }; |
| 33 | 28 |
| 34 --paper-font-common-expensive-kerning: { | 29 --paper-font-common-expensive-kerning: { |
| 35 text-rendering: optimizeLegibility; | 30 text-rendering: optimizeLegibility; |
| 36 }; | 31 }; |
| 37 | 32 |
| 38 --paper-font-common-nowrap: { | 33 --paper-font-common-nowrap: { |
| 39 white-space: nowrap; | 34 white-space: nowrap; |
| 40 overflow: hidden; | 35 overflow: hidden; |
| 41 text-overflow: ellipsis; | 36 text-overflow: ellipsis; |
| 42 }; | 37 }; |
| 43 | 38 |
| 44 /* Material Font Styles */ | 39 /* Material Font Styles */ |
| 45 | 40 |
| 46 --paper-font-display4: { | 41 --paper-font-display4: { |
| 47 /* @apply(--paper-font-common-base) */ | 42 @apply(--paper-font-common-base); |
| 48 font-family: 'Roboto', 'Noto', sans-serif; | 43 @apply(--paper-font-common-nowrap); |
| 49 -webkit-font-smoothing: antialiased; | |
| 50 | |
| 51 /* @apply(--paper-font-common-nowrap); */ | |
| 52 white-space: nowrap; | |
| 53 overflow: hidden; | |
| 54 text-overflow: ellipsis; | |
| 55 | 44 |
| 56 font-size: 112px; | 45 font-size: 112px; |
| 57 font-weight: 300; | 46 font-weight: 300; |
| 58 letter-spacing: -.044em; | 47 letter-spacing: -.044em; |
| 59 line-height: 120px; | 48 line-height: 120px; |
| 60 }; | 49 }; |
| 61 | 50 |
| 62 --paper-font-display3: { | 51 --paper-font-display3: { |
| 63 /* @apply(--paper-font-common-base) */ | 52 @apply(--paper-font-common-base); |
| 64 font-family: 'Roboto', 'Noto', sans-serif; | 53 @apply(--paper-font-common-nowrap); |
| 65 -webkit-font-smoothing: antialiased; | |
| 66 | |
| 67 /* @apply(--paper-font-common-nowrap); */ | |
| 68 white-space: nowrap; | |
| 69 overflow: hidden; | |
| 70 text-overflow: ellipsis; | |
| 71 | 54 |
| 72 font-size: 56px; | 55 font-size: 56px; |
| 73 font-weight: 400; | 56 font-weight: 400; |
| 74 letter-spacing: -.026em; | 57 letter-spacing: -.026em; |
| 75 line-height: 60px; | 58 line-height: 60px; |
| 76 }; | 59 }; |
| 77 | 60 |
| 78 --paper-font-display2: { | 61 --paper-font-display2: { |
| 79 /* @apply(--paper-font-common-base) */ | 62 @apply(--paper-font-common-base); |
| 80 font-family: 'Roboto', 'Noto', sans-serif; | |
| 81 -webkit-font-smoothing: antialiased; | |
| 82 | |
| 83 | 63 |
| 84 font-size: 45px; | 64 font-size: 45px; |
| 85 font-weight: 400; | 65 font-weight: 400; |
| 86 letter-spacing: -.018em; | 66 letter-spacing: -.018em; |
| 87 line-height: 48px; | 67 line-height: 48px; |
| 88 }; | 68 }; |
| 89 | 69 |
| 90 --paper-font-display1: { | 70 --paper-font-display1: { |
| 91 /* @apply(--paper-font-common-base) */ | 71 @apply(--paper-font-common-base); |
| 92 font-family: 'Roboto', 'Noto', sans-serif; | |
| 93 -webkit-font-smoothing: antialiased; | |
| 94 | |
| 95 | 72 |
| 96 font-size: 34px; | 73 font-size: 34px; |
| 97 font-weight: 400; | 74 font-weight: 400; |
| 98 letter-spacing: -.01em; | 75 letter-spacing: -.01em; |
| 99 line-height: 40px; | 76 line-height: 40px; |
| 100 }; | 77 }; |
| 101 | 78 |
| 102 --paper-font-headline: { | 79 --paper-font-headline: { |
| 103 /* @apply(--paper-font-common-base) */ | 80 @apply(--paper-font-common-base); |
| 104 font-family: 'Roboto', 'Noto', sans-serif; | |
| 105 -webkit-font-smoothing: antialiased; | |
| 106 | |
| 107 | 81 |
| 108 font-size: 24px; | 82 font-size: 24px; |
| 109 font-weight: 400; | 83 font-weight: 400; |
| 110 letter-spacing: -.012em; | 84 letter-spacing: -.012em; |
| 111 line-height: 32px; | 85 line-height: 32px; |
| 112 }; | 86 }; |
| 113 | 87 |
| 114 --paper-font-title: { | 88 --paper-font-title: { |
| 115 /* @apply(--paper-font-common-base) */ | 89 @apply(--paper-font-common-base); |
| 116 font-family: 'Roboto', 'Noto', sans-serif; | 90 @apply(--paper-font-common-nowrap); |
| 117 -webkit-font-smoothing: antialiased; | |
| 118 | |
| 119 /* @apply(--paper-font-common-nowrap); */ | |
| 120 white-space: nowrap; | |
| 121 overflow: hidden; | |
| 122 text-overflow: ellipsis; | |
| 123 | 91 |
| 124 font-size: 20px; | 92 font-size: 20px; |
| 125 font-weight: 500; | 93 font-weight: 500; |
| 126 line-height: 28px; | 94 line-height: 28px; |
| 127 }; | 95 }; |
| 128 | 96 |
| 129 --paper-font-subhead: { | 97 --paper-font-subhead: { |
| 130 /* @apply(--paper-font-common-base) */ | 98 @apply(--paper-font-common-base); |
| 131 font-family: 'Roboto', 'Noto', sans-serif; | |
| 132 -webkit-font-smoothing: antialiased; | |
| 133 | |
| 134 | 99 |
| 135 font-size: 16px; | 100 font-size: 16px; |
| 136 font-weight: 400; | 101 font-weight: 400; |
| 137 line-height: 24px; | 102 line-height: 24px; |
| 138 }; | 103 }; |
| 139 | 104 |
| 140 --paper-font-body2: { | 105 --paper-font-body2: { |
| 141 /* @apply(--paper-font-common-base) */ | 106 @apply(--paper-font-common-base); |
| 142 font-family: 'Roboto', 'Noto', sans-serif; | |
| 143 -webkit-font-smoothing: antialiased; | |
| 144 | 107 |
| 145 font-size: 14px; | 108 font-size: 14px; |
| 146 font-weight: 500; | 109 font-weight: 500; |
| 147 line-height: 24px; | 110 line-height: 24px; |
| 148 }; | 111 }; |
| 149 | 112 |
| 150 --paper-font-body1: { | 113 --paper-font-body1: { |
| 151 /* @apply(--paper-font-common-base) */ | 114 @apply(--paper-font-common-base); |
| 152 font-family: 'Roboto', 'Noto', sans-serif; | |
| 153 -webkit-font-smoothing: antialiased; | |
| 154 | 115 |
| 155 font-size: 14px; | 116 font-size: 14px; |
| 156 font-weight: 400; | 117 font-weight: 400; |
| 157 line-height: 20px; | 118 line-height: 20px; |
| 158 }; | 119 }; |
| 159 | 120 |
| 160 --paper-font-caption: { | 121 --paper-font-caption: { |
| 161 /* @apply(--paper-font-common-base) */ | 122 @apply(--paper-font-common-base); |
| 162 font-family: 'Roboto', 'Noto', sans-serif; | 123 @apply(--paper-font-common-nowrap); |
| 163 -webkit-font-smoothing: antialiased; | |
| 164 /* @apply(--paper-font-common-nowrap); */ | |
| 165 white-space: nowrap; | |
| 166 overflow: hidden; | |
| 167 text-overflow: ellipsis; | |
| 168 | 124 |
| 169 font-size: 12px; | 125 font-size: 12px; |
| 170 font-weight: 400; | 126 font-weight: 400; |
| 171 letter-spacing: 0.011em; | 127 letter-spacing: 0.011em; |
| 172 line-height: 20px; | 128 line-height: 20px; |
| 173 }; | 129 }; |
| 174 | 130 |
| 175 --paper-font-menu: { | 131 --paper-font-menu: { |
| 176 /* @apply(--paper-font-common-base) */ | 132 @apply(--paper-font-common-base); |
| 177 font-family: 'Roboto', 'Noto', sans-serif; | 133 @apply(--paper-font-common-nowrap); |
| 178 -webkit-font-smoothing: antialiased; | |
| 179 | |
| 180 /* @apply(--paper-font-common-nowrap); */ | |
| 181 white-space: nowrap; | |
| 182 overflow: hidden; | |
| 183 text-overflow: ellipsis; | |
| 184 | 134 |
| 185 font-size: 13px; | 135 font-size: 13px; |
| 186 font-weight: 500; | 136 font-weight: 500; |
| 187 line-height: 24px; | 137 line-height: 24px; |
| 188 }; | 138 }; |
| 189 | 139 |
| 190 --paper-font-button: { | 140 --paper-font-button: { |
| 191 /* @apply(--paper-font-common-base) */ | 141 @apply(--paper-font-common-base); |
| 192 font-family: 'Roboto', 'Noto', sans-serif; | 142 @apply(--paper-font-common-nowrap); |
| 193 -webkit-font-smoothing: antialiased; | |
| 194 | |
| 195 /* @apply(--paper-font-common-nowrap); */ | |
| 196 white-space: nowrap; | |
| 197 overflow: hidden; | |
| 198 text-overflow: ellipsis; | |
| 199 | 143 |
| 200 font-size: 14px; | 144 font-size: 14px; |
| 201 font-weight: 500; | 145 font-weight: 500; |
| 202 letter-spacing: 0.018em; | 146 letter-spacing: 0.018em; |
| 203 line-height: 24px; | 147 line-height: 24px; |
| 204 text-transform: uppercase; | 148 text-transform: uppercase; |
| 205 }; | 149 }; |
| 206 | 150 |
| 207 --paper-font-code2: { | 151 --paper-font-code2: { |
| 208 /* @apply(--paper-font-common-code); */ | 152 @apply(--paper-font-common-code); |
| 209 font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace; | |
| 210 -webkit-font-smoothing: antialiased; | |
| 211 | 153 |
| 212 font-size: 14px; | 154 font-size: 14px; |
| 213 font-weight: 700; | 155 font-weight: 700; |
| 214 line-height: 20px; | 156 line-height: 20px; |
| 215 }; | 157 }; |
| 216 | 158 |
| 217 --paper-font-code1: { | 159 --paper-font-code1: { |
| 218 /* @apply(--paper-font-common-code); */ | 160 @apply(--paper-font-common-code); |
| 219 font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace; | |
| 220 -webkit-font-smoothing: antialiased; | |
| 221 | 161 |
| 222 font-size: 14px; | 162 font-size: 14px; |
| 223 font-weight: 500; | 163 font-weight: 500; |
| 224 line-height: 20px; | 164 line-height: 20px; |
| 225 }; | 165 }; |
| 226 | 166 |
| 227 } | 167 } |
| 228 | 168 |
| 229 </style> | 169 </style> |
| OLD | NEW |