GreenPolyProducts/polymer
5
0
Fork 0
mirror of https://github.com/Polymer/polymer.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes based on review.

Browse Source
This commit is contained in:
Steven Orvell 2016-02-12 19:05:15 -08:00
parent f8289fec8c
commit f2c1d4a5eb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/standard/styling.html
View File

@ -47,14 +47,14 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
var cssText = styleTransformer.elementStyles(this); var cssText = styleTransformer.elementStyles(this);
// do we really need to output shimmed styles // do we really need to output shimmed styles
var needsStatic = this._needsStaticStyles(this._styles); var needsStatic = this._needsStaticStyles(this._styles);
// NOTE: IE has css style ordering issues unless there's at least a
// space in the stylesheet.
cssText = needsStatic ? cssText : ' ';
// under shady dom we always output a shimmed style (which may be // under shady dom we always output a shimmed style (which may be
// empty) so that other dynamic stylesheets can always be placed // empty) so that other dynamic stylesheets can always be placed
// after the element's main stylesheet. // after the element's main stylesheet.
// This helps ensure element styles are always in registration order. // This helps ensure element styles are always in registration order.
if (needsStatic || !nativeShadow) { if (needsStatic || !nativeShadow) {
// NOTE: IE has css style ordering issues unless there's at least a
// space in the stylesheet.
cssText = needsStatic ? cssText : ' ';
var style = styleUtil.applyCss(cssText, this.is, var style = styleUtil.applyCss(cssText, this.is,
nativeShadow ? this._template.content : null); nativeShadow ? this._template.content : null);
// keep track of style when in document scope (polyfill) so we can // keep track of style when in document scope (polyfill) so we can

1
test/unit/styling-cross-scope-var.html
View File

@ -845,7 +845,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
assert.equal('url(http://placehold.it/400x300)', url); assert.equal('url(http://placehold.it/400x300)', url);
}); });
// skip for now, until #3326 is fixed
test('custom style class overrides css variable', function() { test('custom style class overrides css variable', function() {
var d = document.createElement('x-variable-override'); var d = document.createElement('x-variable-override');
d.classList.add('variable-override'); d.classList.add('variable-override');