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.

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

Fix 'inline-block' sizing issues #4783

Merged
merged 2 commits into from
Feb 3, 2015

Conversation

mttr
Copy link
Contributor

@mttr mttr commented Jan 30, 2015

The first commit fixes #3624, and the second commit fixes a bug uncovered by the first fix and caught by a reftest (according to CSS 2.1, inline-blocks should have the shrink-to-fit algorithm run on them when size is set to 'auto'). The two new reftests included here fail before the fix and pass afterwards.

@hoppipolla-critic-bot
Copy link

Critic review: https://critic.hoppipolla.co.uk/r/3879

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@jdm jdm added the S-awaiting-review There is new code that needs to be reviewed. label Jan 30, 2015
@mbrubeck mbrubeck self-assigned this Feb 2, 2015
@mbrubeck mbrubeck added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. labels Feb 2, 2015
@mbrubeck
Copy link
Contributor

mbrubeck commented Feb 2, 2015

Review complete, with one minor stylistic change suggested (on Critic).

@mttr
Copy link
Contributor Author

mttr commented Feb 2, 2015

Thanks! That bit of code was really bothering me, and I somehow missed the obvious solution. I'll have the changes in as soon as it finishes compiling/testing.

@mbrubeck
Copy link
Contributor

mbrubeck commented Feb 2, 2015

Great! Can squash and land with r=mbrubeck.

@mbrubeck mbrubeck added S-needs-squash Some (or all) of the commits in the PR should be combined. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Feb 2, 2015
@mttr
Copy link
Contributor Author

mttr commented Feb 3, 2015

Squashed/rebased!

@jdm jdm removed the S-needs-squash Some (or all) of the commits in the PR should be combined. label Feb 3, 2015
bors-servo pushed a commit that referenced this pull request Feb 3, 2015
The first commit fixes #3624, and the second commit fixes a bug uncovered by the first fix and caught by a reftest (according to CSS 2.1, inline-blocks should have the shrink-to-fit algorithm run on them when size is set to 'auto'). The two new reftests included here fail before the fix and pass afterwards.
@bors-servo bors-servo closed this Feb 3, 2015
@bors-servo bors-servo merged commit 846fc64 into servo:master Feb 3, 2015
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.

Inline-blocks with percentage widths don't work right
5 participants