Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes url's in style mixins. #1624

Merged
merged 1 commit into from
May 26, 2015
Merged

Fixes url's in style mixins. #1624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/style-properties.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
pp[1] = pp[1].trim();
pp[1] = this.valueForProperty(pp[1], props) || pp[1];
}
p = pp.join(': ');
p = pp.join(':');
}
parts[i] = (p && p.lastIndexOf(';') === p.length - 1) ?
// strip trailing ;
Expand Down
8 changes: 8 additions & 0 deletions test/unit/styling-cross-scope-apply.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

--mixin2: {
border: 3px solid seagreen;
background: url(http://www.google.com/icon.png);
};
}

Expand Down Expand Up @@ -177,6 +178,13 @@
assertComputed(styled.$.mixin4, '2px', 'margin-top');
});

test('mixins apply with url values', function() {
var url = 'http://www.google.com/icon.png';
var e = styled.$.child;
assert.include(e._styleProperties['--mixin2'], url);
assert.include(e._customStyle.textContent, url);
});

test('variable mixins inherit and override', function() {
var e = styled.$.child;
assertComputed(e.$.mixin1, '1px');
Expand Down