Skip to content

enable style merge behavior between parent-child components (fix #3997) #4138

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.

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

Merged
merged 6 commits into from
Nov 7, 2016
Merged

enable style merge behavior between parent-child components (fix #3997) #4138

merged 6 commits into from
Nov 7, 2016

Conversation

defcc
Copy link
Member

@defcc defcc commented Nov 6, 2016

fix #3997

Style priority orders as bellow:

  1. binding style > static style.
  2. parent style > child style.

@defcc defcc changed the title enable style merge behavior between parent-child components (fix #3997) [wip] enable style merge behavior between parent-child components (fix #3997) Nov 7, 2016
@defcc
Copy link
Member Author

defcc commented Nov 7, 2016

Something wrong with background-image parsing. I'll update it later.

@defcc
Copy link
Member Author

defcc commented Nov 7, 2016

Will use a regexp to parse if background property included.

background:url(http://xxx.jpg);
background-image:url(data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAARBxAR/Q9ERP8DAABWUDggGAAAABQBAJ0BKgEAAQAAAP4AAA3AAP7mtQAAAA==)

@defcc defcc changed the title [wip] enable style merge behavior between parent-child components (fix #3997) enable style merge behavior between parent-child components (fix #3997) Nov 7, 2016
@yyx990803
Copy link
Member

Thanks! There are a few places where I think there could be some perf improvement, but it's a bit hard to explain so I'll merge and tweak.

@yyx990803 yyx990803 merged commit e960cd1 into vuejs:dev Nov 7, 2016
@defcc
Copy link
Member Author

defcc commented Nov 7, 2016

Thanks @yyx990803 ,I'll take a look.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Overwriting "style" attribute [Vue 2.0]
2 participants