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

Add initial support for the line-height property. #521

Merged
merged 2 commits into from Jun 20, 2013

Conversation

@jrfeenst
Copy link
Contributor

jrfeenst commented Jun 17, 2013

Line height is only based on the tallest box in each line and does not factor in the vertical-alignment. Improves whitespace handling by passing the whitespace state between function invocations.

There were too many changes on master to easily rebase. It was easier to merge to a fresh branch.

Here is the original PR: #509

jrfeenst added 2 commits May 29, 2013
… based on the tallest box in each line and does not factor in the vertical-alignment. Improves whitespace handling by passing the whitespace state between function invocations.
… based on the tallest box in each line and does not factor in the vertical-alignment. Improves whitespace handling by passing the whitespace state between function invocations.
@metajack
Copy link
Contributor

metajack commented Jun 17, 2013

This is r+ pending responses to the above comments.

@jrfeenst
Copy link
Contributor Author

jrfeenst commented Jun 19, 2013

I have replied to the above comments.

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on 7dcff2b Jun 20, 2013

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 20, 2013

merging jrfeenst/servo/line-height-rebase2 = 7dcff2b into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 20, 2013

jrfeenst/servo/line-height-rebase2 = 7dcff2b merged ok, testing candidate = 0d438e7

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 20, 2013

fast-forwarding master to auto = 0d438e7

bors-servo pushed a commit that referenced this pull request Jun 20, 2013
Line height is only based on the tallest box in each line and does not factor in the vertical-alignment. Improves whitespace handling by passing the whitespace state between function invocations.

There were too many changes on master to easily rebase. It was easier to merge to a fresh branch.

Here is the original PR: #509
@bors-servo bors-servo merged commit 7dcff2b into servo:master Jun 20, 2013
1 check passed
1 check passed
default all tests passed
@pcwalton
Copy link
Contributor

pcwalton commented Jun 20, 2013

This broke a ton of pages, so I backed it out. Sorry… See notes below.

#530

ChrisParis pushed a commit to ChrisParis/servo that referenced this pull request Sep 7, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.