Skip to content

Commit

Permalink
Minor fixes based on review.
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven Orvell committed Feb 13, 2016
1 parent f8289fe commit f2c1d4a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/standard/styling.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
var cssText = styleTransformer.elementStyles(this);
// do we really need to output shimmed 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
// empty) so that other dynamic stylesheets can always be placed
// after the element's main stylesheet.
// This helps ensure element styles are always in registration order.
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,
nativeShadow ? this._template.content : null);
// keep track of style when in document scope (polyfill) so we can
Expand Down
1 change: 0 additions & 1 deletion test/unit/styling-cross-scope-var.html
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,6 @@
assert.equal('url(http://placehold.it/400x300)', url);
});

// skip for now, until #3326 is fixed
test('custom style class overrides css variable', function() {
var d = document.createElement('x-variable-override');
d.classList.add('variable-override');
Expand Down

0 comments on commit f2c1d4a

Please sign in to comment.