third_party/polymer/v0_8/components/paper-styles/typography.html - Issue 1155683008: Rename polymer and cr_elements v0_8 to v1_0

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

Issue 1155683008: Rename polymer and cr_elements v0_8 to v1_0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v1

Patch Set: fix a merge mistake Created 5 years, 6 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

« no previous file with comments | « third_party/polymer/v0_8/components/paper-styles/shadow.html ('k') | third_party/polymer/v0_8/components/paper-tabs/.bower.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	(Empty)
1 <!--

2 @license

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

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

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

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

13 <link rel="import" href="../polymer/polymer.html">

14

15 <style is="custom-style">

16

17 :root {

18

19 /* Shared Styles */

20

21 /*

22 Unfortunately, we can't make use of these yet - sibling properties aren't

23 evaluated. See https://github.com/Polymer/polymer/issues/1399

24

25 --paper-font-common-base: {

26 font-family: 'Roboto', 'Noto', sans-serif;

27 -webkit-font-smoothing: antialiased;

28 };

29

30 --paper-font-common-code: {

31 font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menl o', monospace;

32 -webkit-font-smoothing: antialiased;

33 };

34

35 --paper-font-common-expensive-kerning: {

36 text-rendering: optimizeLegibility;

37 };

38

39 --paper-font-common-nowrap: {

40 white-space: nowrap;

41 overflow: hidden;

42 text-overflow: ellipsis;

43 };

44 */

45

46 /* Material Font Styles */

47

48 --paper-font-display4: {

49 /* @apply(--paper-font-common-base) */

50 font-family: 'Roboto', 'Noto', sans-serif;

51 -webkit-font-smoothing: antialiased;

52 /* @apply(--paper-font-common-expensive-kerning); */

53 text-rendering: optimizeLegibility;

54 /* @apply(--paper-font-common-nowrap); */

55 white-space: nowrap;

56 overflow: hidden;

57 text-overflow: ellipsis;

58

59 font-size: 112px;

60 font-weight: 300;

61 letter-spacing: -.044em;

62 line-height: 120px;

63 };

64

65 --paper-font-display3: {

66 /* @apply(--paper-font-common-base) */

67 font-family: 'Roboto', 'Noto', sans-serif;

68 -webkit-font-smoothing: antialiased;

69 /* @apply(--paper-font-common-expensive-kerning); */

70 text-rendering: optimizeLegibility;

71 /* @apply(--paper-font-common-nowrap); */

72 white-space: nowrap;

73 overflow: hidden;

74 text-overflow: ellipsis;

75

76 font-size: 56px;

77 font-weight: 400;

78 letter-spacing: -.026em;

79 line-height: 60px;

80 };

81

82 --paper-font-display2: {

83 /* @apply(--paper-font-common-base) */

84 font-family: 'Roboto', 'Noto', sans-serif;

85 -webkit-font-smoothing: antialiased;

86 /* @apply(--paper-font-common-expensive-kerning); */

87 text-rendering: optimizeLegibility;

88

89 font-size: 45px;

90 font-weight: 400;

91 letter-spacing: -.018em;

92 line-height: 48px;

93 };

94

95 --paper-font-display1: {

96 /* @apply(--paper-font-common-base) */

97 font-family: 'Roboto', 'Noto', sans-serif;

98 -webkit-font-smoothing: antialiased;

99 /* @apply(--paper-font-common-expensive-kerning); */

100 text-rendering: optimizeLegibility;

101

102 font-size: 34px;

103 font-weight: 400;

104 letter-spacing: -.01em;

105 line-height: 40px;

106 };

107

108 --paper-font-headline: {

109 /* @apply(--paper-font-common-base) */

110 font-family: 'Roboto', 'Noto', sans-serif;

111 -webkit-font-smoothing: antialiased;

112 /* @apply(--paper-font-common-expensive-kerning); */

113 text-rendering: optimizeLegibility;

114

115 font-size: 24px;

116 font-weight: 400;

117 letter-spacing: -.012em;

118 line-height: 32px;

119 };

120

121 --paper-font-title: {

122 /* @apply(--paper-font-common-base) */

123 font-family: 'Roboto', 'Noto', sans-serif;

124 -webkit-font-smoothing: antialiased;

125 /* @apply(--paper-font-common-expensive-kerning); */

126 text-rendering: optimizeLegibility;

127 /* @apply(--paper-font-common-nowrap); */

128 white-space: nowrap;

129 overflow: hidden;

130 text-overflow: ellipsis;

131

132 font-size: 20px;

133 font-weight: 500;

134 line-height: 28px;

135 };

136

137 --paper-font-subhead: {

138 /* @apply(--paper-font-common-base) */

139 font-family: 'Roboto', 'Noto', sans-serif;

140 -webkit-font-smoothing: antialiased;

141 /* @apply(--paper-font-common-expensive-kerning); */

142 text-rendering: optimizeLegibility;

143

144 font-size: 16px;

145 font-weight: 400;

146 line-height: 24px;

147 };

148

149 --paper-font-body2: {

150 /* @apply(--paper-font-common-base) */

151 font-family: 'Roboto', 'Noto', sans-serif;

152 -webkit-font-smoothing: antialiased;

153

154 font-size: 14px;

155 font-weight: 500;

156 line-height: 24px;

157 };

158

159 --paper-font-body1: {

160 /* @apply(--paper-font-common-base) */

161 font-family: 'Roboto', 'Noto', sans-serif;

162 -webkit-font-smoothing: antialiased;

163

164 font-size: 14px;

165 font-weight: 400;

166 line-height: 20px;

167 };

168

169 --paper-font-caption: {

170 /* @apply(--paper-font-common-base) */

171 font-family: 'Roboto', 'Noto', sans-serif;

172 -webkit-font-smoothing: antialiased;

173 /* @apply(--paper-font-common-nowrap); */

174 white-space: nowrap;

175 overflow: hidden;

176 text-overflow: ellipsis;

177

178 font-size: 12px;

179 font-weight: 400;

180 letter-spacing: 0.011em;

181 line-height: 20px;

182 };

183

184 --paper-font-menu: {

185 /* @apply(--paper-font-common-base) */

186 font-family: 'Roboto', 'Noto', sans-serif;

187 -webkit-font-smoothing: antialiased;

188 /* @apply(--paper-font-common-expensive-kerning); */

189 text-rendering: optimizeLegibility;

190 /* @apply(--paper-font-common-nowrap); */

191 white-space: nowrap;

192 overflow: hidden;

193 text-overflow: ellipsis;

194

195 font-size: 13px;

196 font-weight: 500;

197 line-height: 24px;

198 };

199

200 --paper-font-button: {

201 /* @apply(--paper-font-common-base) */

202 font-family: 'Roboto', 'Noto', sans-serif;

203 -webkit-font-smoothing: antialiased;

204 /* @apply(--paper-font-common-expensive-kerning); */

205 text-rendering: optimizeLegibility;

206 /* @apply(--paper-font-common-nowrap); */

207 white-space: nowrap;

208 overflow: hidden;

209 text-overflow: ellipsis;

210

211 font-size: 14px;

212 font-weight: 500;

213 letter-spacing: 0.018em;

214 line-height: 24px;

215 text-transform: uppercase;

216 };

217

218 --paper-font-code2: {

219 /* @apply(--paper-font-common-code); */

220 font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menl o', monospace;

221 -webkit-font-smoothing: antialiased;

222

223 font-size: 14px;

224 font-weight: 700;

225 line-height: 20px;

226 };

227

228 --paper-font-code1: {

229 /* @apply(--paper-font-common-code); */

230 font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menl o', monospace;

231 -webkit-font-smoothing: antialiased;

232

233 font-size: 14px;

234 font-weight: 500;

235 line-height: 20px;

236 };

237

238 }

239

240 </style>

OLD	NEW