Skip to content

/ servo

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

Adjust display value for ::-moz-fieldset-content when parent is flex/grid #17764

Merged
merged 1 commit into from Jul 18, 2017
Merged

Adjust display value for ::-moz-fieldset-content when parent is flex/grid #17764

merged 1 commit into from Jul 18, 2017

Conversation

@upsuper
Copy link
Member

upsuper commented Jul 17, 2017 •
edited by larsbergstrom

This is the Servo side change for bug 1379901.

This change is Reviewable
@highfive
Copy link

highfive commented Jul 17, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/style_adjuster.rs, components/style/gecko/pseudo_element.rs, components/style/properties/properties.mako.rs
  • @canaltinova: components/style/style_adjuster.rs, components/style/gecko/pseudo_element.rs, components/style/properties/properties.mako.rs
  • @emilio: ports/geckolib/glue.rs, components/style/style_adjuster.rs, components/style/gecko/pseudo_element.rs, components/style/properties/properties.mako.rs
@highfive
Copy link

highfive commented Jul 17, 2017

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@upsuper
Copy link
Member Author

upsuper commented Jul 17, 2017

@bors-servo r=emilio,heycam
@bors-servo
Copy link
Contributor

bors-servo commented Jul 17, 2017

📌 Commit b5b24cf has been approved by emilio,heycam
@highfive highfive assigned emilio and unassigned jdm Jul 17, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

⌛ Testing commit b5b24cf with merge 0668404...
bors-servo added a commit that referenced this pull request Jul 18, 2017
@bors-servo
Auto merge of #17764 - upsuper:fieldset-flexgrid, r=emilio,heycam
Loading status checks…
0668404 
Adjust display value for ::-moz-fieldset-content when parent is flex/grid

This is the Servo side change for [bug 1379901](https://bugzilla.mozilla.org/show_bug.cgi?id=1379901).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17764)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

💔 Test failed - linux-rel-css
@upsuper
Copy link
Member Author

upsuper commented Jul 18, 2017

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

🔒 Merge conflict
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

☔ The latest upstream changes (presumably #17767) made this pull request unmergeable. Please resolve the merge conflicts.
@upsuper upsuper force-pushed the upsuper-forks:fieldset-flexgrid branch from b5b24cf to ee4f797 Jul 18, 2017
@upsuper
Copy link
Member Author

upsuper commented Jul 18, 2017

@bors-servo r=emilio,heycam
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

📌 Commit ee4f797 has been approved by emilio,heycam
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

⌛ Testing commit ee4f797 with merge b38396c...
bors-servo added a commit that referenced this pull request Jul 18, 2017
@bors-servo
Auto merge of #17764 - upsuper:fieldset-flexgrid, r=emilio,heycam
Loading status checks…
b38396c 
Adjust display value for ::-moz-fieldset-content when parent is flex/grid

This is the Servo side change for [bug 1379901](https://bugzilla.mozilla.org/show_bug.cgi?id=1379901).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17764)
<!-- Reviewable:end -->
@upsuper upsuper force-pushed the upsuper-forks:fieldset-flexgrid branch from ee4f797 to e89134d Jul 18, 2017
@upsuper
Copy link
Member Author

upsuper commented Jul 18, 2017

@bors-servo r=emilio,heycam
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

📌 Commit e89134d has been approved by emilio,heycam
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

⌛ Testing commit e89134d with merge 2933bfd...
bors-servo added a commit that referenced this pull request Jul 18, 2017
@bors-servo
Auto merge of #17764 - upsuper:fieldset-flexgrid, r=emilio,heycam
Loading status checks…
2933bfd 
Adjust display value for ::-moz-fieldset-content when parent is flex/grid

This is the Servo side change for [bug 1379901](https://bugzilla.mozilla.org/show_bug.cgi?id=1379901).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17764)
<!-- Reviewable:end -->
@upsuper
Adjust display value for ::-moz-fieldset-content when parent is flex/…
Loading status checks…
bae59d4 
…grid.
@upsuper upsuper force-pushed the upsuper-forks:fieldset-flexgrid branch from e89134d to bae59d4 Jul 18, 2017
@upsuper
Copy link
Member Author

upsuper commented Jul 18, 2017

@bors-servo r=emilio,heycam
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

📌 Commit bae59d4 has been approved by emilio,heycam
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

⌛ Testing commit bae59d4 with merge 1b6d29e...
bors-servo added a commit that referenced this pull request Jul 18, 2017
@bors-servo
Auto merge of #17764 - upsuper:fieldset-flexgrid, r=emilio,heycam
Loading status checks…
1b6d29e 
Adjust display value for ::-moz-fieldset-content when parent is flex/grid

This is the Servo side change for [bug 1379901](https://bugzilla.mozilla.org/show_bug.cgi?id=1379901).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17764)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: emilio,heycam
Pushing 1b6d29e to master...
@bors-servo bors-servo merged commit bae59d4 into servo:master Jul 18, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@upsuper upsuper deleted the upsuper-forks:fieldset-flexgrid branch Jul 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@emilio emilio

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@upsuper @highfive @bors-servo @jdm @emilio
You can’t perform that action at this time.