Skip to content

Commit

Permalink
Fix lint error and uncomment test.
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven Orvell committed Feb 11, 2016
1 parent 71c41ed commit c00c47f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/lib/style-properties.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@

// returns cssText of properties that consume variables/mixins
collectCssText: function(rule) {
var customCssText = '';
var cssText = rule.parsedCssText;
// NOTE: we support consumption inside mixin assignment
// but not production, so strip out {...}
Expand Down
7 changes: 3 additions & 4 deletions test/unit/styling-cross-scope-var.html
Original file line number Diff line number Diff line change
Expand Up @@ -851,10 +851,9 @@
assertComputed(d.$.consumer, '10px');
});

// TODO(sorvell): fix for #1761 was reverted; include test once this issue is addressed
// test('var values can be overridden by subsequent concrete properties', function() {
// assertComputed(styled.$.overridesConcrete, '4px');
// });
test('var values can be overridden by subsequent concrete properties', function() {
assertComputed(styled.$.overridesConcrete, '4px');
});

});

Expand Down

0 comments on commit c00c47f

Please sign in to comment.