third_party/polymer/v1_0/components-chromium/paper-toolbar/paper-toolbar.html - Issue 2158913007: Roll Polymer from 1.5.0 -> 1.6.0 to pick up native CSS custom props

Side by Side Diff: third_party/polymer/v1_0/components-chromium/paper-toolbar/paper-toolbar.html

Issue 2158913007: Roll Polymer from 1.5.0 -> 1.6.0 to pick up native CSS custom props (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 4 years, 4 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/v1_0/components-chromium/paper-toolbar/bower.json ('k') | third_party/polymer/v1_0/components-chromium/polymer/bower.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 --><html><head><link rel="import" href="../polymer/polymer.html">	9 --><html><head><link rel="import" href="../polymer/polymer.html">

10 <link rel="import" href="../paper-styles/default-theme.html">	10 <link rel="import" href="../paper-styles/default-theme.html">

(...skipping 200 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
211	211

212 white-space: nowrap;	212 white-space: nowrap;

213 overflow: hidden;	213 overflow: hidden;

214 text-overflow: ellipsis;	214 text-overflow: ellipsis;

215 font-size: 20px;	215 font-size: 20px;

216 font-weight: 400;	216 font-weight: 400;

217 line-height: 1;	217 line-height: 1;

218 pointer-events: none;	218 pointer-events: none;

219	219

220 @apply(--layout-flex);	220 @apply(--layout-flex);

	221 }

	222

	223 .toolbar-tools > ::content > .title {

	224 margin-left: 56px;

	225 }

	226

	227 .toolbar-tools > ::content > paper-icon-button + .title {

	228 margin-left: 0;

	229 }

	230

	231 /**

	232 * The --paper-toolbar-title mixin is applied here instead of above to

	233 * fix the issue with margin-left being ignored due to css ordering.

	234 */

	235 .toolbar-tools > ::content .title {

221 @apply(--paper-toolbar-title);	236 @apply(--paper-toolbar-title);

222 }	237 }

223	238

224 /**

225 * TODO: Refactor these selectors

226 * Work in progress.

227 */

228 .toolbar-tools > ::content paper-icon-button[icon=menu] {	239 .toolbar-tools > ::content paper-icon-button[icon=menu] {

229 margin-right: 24px;	240 margin-right: 24px;

230 }	241 }

231	242

232 .toolbar-tools > ::content > .title,

233 .toolbar-tools > ::content[select=".middle"] > .title,

234 .toolbar-tools > ::content[select=".bottom"] > .title {

235 margin-left: 56px;

236 }

237

238 .toolbar-tools > ::content > paper-icon-button + .title,

239 .toolbar-tools > ::content[select=".middle"] paper-icon-button + .title,

240 .toolbar-tools > ::content[select=".bottom"] paper-icon-button + .title {

241 margin-left: 0;

242 }

243

244 .toolbar-tools > ::content > .fit {	243 .toolbar-tools > ::content > .fit {

245 position: absolute;	244 position: absolute;

246 top: auto;	245 top: auto;

247 right: 0;	246 right: 0;

248 bottom: 0;	247 bottom: 0;

249 left: 0;	248 left: 0;

250 width: auto;	249 width: auto;

251 margin: 0;	250 margin: 0;

252 }	251 }

253	252

(...skipping 29 matching lines...) Expand all Loading...
283 <content select=".middle"></content>	282 <content select=".middle"></content>

284 </div>	283 </div>

285	284

286 <div id="bottomBar" class$="toolbar-tools [[_computeBarExtraClasses(bottomJu stify)]]">	285 <div id="bottomBar" class$="toolbar-tools [[_computeBarExtraClasses(bottomJu stify)]]">

287 <content select=".bottom"></content>	286 <content select=".bottom"></content>

288 </div>	287 </div>

289 </template>	288 </template>

290	289

291 </dom-module>	290 </dom-module>

292 <script src="paper-toolbar-extracted.js"></script></body></html>	291 <script src="paper-toolbar-extracted.js"></script></body></html>

OLD	NEW