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 Layout 2020 support for display: list-item #27385

Merged
merged 3 commits into from Jul 25, 2020
Merged

Add Layout 2020 support for display: list-item #27385

merged 3 commits into from Jul 25, 2020

Conversation

SimonSapin
Copy link
Member

@SimonSapin SimonSapin commented Jul 23, 2020

No description provided.

@SimonSapin SimonSapin added the A-layout/2020 label Jul 23, 2020
@highfive
Copy link

highfive commented Jul 23, 2020

Heads up! This PR modifies the following files:

  • @emilio: components/style/values/generics/counters.rs, components/style/properties/longhands/list.mako.rs, components/style/values/specified/counters.rs, components/style/values/specified/box.rs, components/style/properties/shorthands/list.mako.rs

UrlOrNone::None => None,
};
marker_image().or_else(|| {
Some(vec![PseudoElementContentItem::Text(
Copy link
Member

@Manishearth Manishearth Jul 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not just inline this into the above closure?

Copy link
Member Author

@SimonSapin SimonSapin Jul 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The closure uses ? so it has two paths that can return None. This implements “If the <image> represents a valid image” in https://drafts.csswg.org/css-lists/#marker-image

@Manishearth
Copy link
Member

Manishearth commented Jul 24, 2020

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Jul 24, 2020

📌 Commit b91e293 has been approved by Manishearth

@highfive highfive assigned Manishearth and unassigned asajeffrey Jul 24, 2020
bors-servo added a commit that referenced this issue Jul 24, 2020
Add Layout 2020 support for `display: list-item`
@bors-servo
Copy link
Contributor

bors-servo commented Jul 24, 2020

Testing commit b91e293 with merge 471d3c6...

@bors-servo
Copy link
Contributor

bors-servo commented Jul 24, 2020

💔 Test failed - status-taskcluster

@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2020

Testing commit b91e293 with merge 9864e4c...

@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2020

☀️ Test successful - status-taskcluster
Approved by: Manishearth
Pushing 9864e4c to master...

@bors-servo bors-servo merged commit 9864e4c into master Jul 25, 2020
2 checks passed
@bors-servo bors-servo deleted the list branch Jul 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-layout/2020
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants