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

Flexbox, the boring parts #26838

Merged
merged 2 commits into from Jun 10, 2020
Merged

Flexbox, the boring parts #26838

merged 2 commits into from Jun 10, 2020

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Jun 9, 2020

I have a local branch starting to implement https://drafts.csswg.org/css-flexbox/#layout-algorithm. It’s not PR-ready yet, but it’s going to be large so here are some of the less interesting parts meaningful by themselves. Landing the module split in particular will help reduce merge conflicts.

CC #26639

@bors-servo
Copy link
Contributor

bors-servo commented Jun 10, 2020

The latest upstream changes (presumably #26833) made this pull request unmergeable. Please resolve the merge conflicts.

@nox
Copy link
Member

nox commented Jun 10, 2020

@bors-servo
Copy link
Contributor

bors-servo commented Jun 10, 2020

📌 Commit dd0d6a2 has been approved by nox

bors-servo added a commit that referenced this pull request Jun 10, 2020
Flexbox, the boring parts

I have a local branch starting to implement https://drafts.csswg.org/css-flexbox/#layout-algorithm. It’s not PR-ready yet, but it’s going to be large so here are some of the less interesting parts meaningful by themselves. Landing the module split in particular will help reduce merge conflicts.

CC #26639
@bors-servo
Copy link
Contributor

bors-servo commented Jun 10, 2020

Testing commit dd0d6a2 with merge 3940787...

@bors-servo
Copy link
Contributor

bors-servo commented Jun 10, 2020

💔 Test failed - status-taskcluster

@SimonSapin
Copy link
Member Author

SimonSapin commented Jun 10, 2020

@bors-servo
Copy link
Contributor

bors-servo commented Jun 10, 2020

Testing commit dd0d6a2 with merge c3fefd1...

bors-servo added a commit that referenced this pull request Jun 10, 2020
Flexbox, the boring parts

I have a local branch starting to implement https://drafts.csswg.org/css-flexbox/#layout-algorithm. It’s not PR-ready yet, but it’s going to be large so here are some of the less interesting parts meaningful by themselves. Landing the module split in particular will help reduce merge conflicts.

CC #26639
@bors-servo
Copy link
Contributor

bors-servo commented Jun 10, 2020

💔 Test failed - status-taskcluster

@jdm
Copy link
Member

jdm commented Jun 10, 2020

@bors-servo
Copy link
Contributor

bors-servo commented Jun 10, 2020

Testing commit dd0d6a2 with merge d85c6ee...

@bors-servo
Copy link
Contributor

bors-servo commented Jun 10, 2020

☀️ Test successful - status-taskcluster
Approved by: nox
Pushing d85c6ee to master...

@bors-servo bors-servo merged commit d85c6ee into master Jun 10, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
@bors-servo bors-servo deleted the flexbox branch Jun 10, 2020
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

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