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

rustdoc: Fix invalid HTML in stability notices #38329

Merged
merged 1 commit into from
Dec 27, 2016

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Dec 12, 2016

em tags cannot contain p tags so use divs instead of ems as the Markdown will create p tags.

@rust-highfive
Copy link
Collaborator

r? @steveklabnik

(rust_highfive has picked a reviewer for you, use r? to override)

@nagisa
Copy link
Member

nagisa commented Dec 13, 2016

em tags cannot contain p tags so just use a div instead.

em tags cannot contain div either.

@ollie27
Copy link
Member Author

ollie27 commented Dec 13, 2016

em tags cannot contain div either.

It's the em tags I've replaced with div. That was a bit ambiguous in my original message.

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Dec 13, 2016

Good catch! Some CSS changes are a bit strange for me, do you have a live versions of this change by any chance?

`em` tags cannot contain `p` tags so just use a `div` instead.
@ollie27 ollie27 force-pushed the rustdoc_stab_em_div branch from 41735fa to e395fd1 Compare December 13, 2016 21:00
@ollie27
Copy link
Member Author

ollie27 commented Dec 13, 2016

I've just force pushed a fix for a small layout issue I noticed.

https://ollie27.github.io/rust_doc_test/std/index.html has this change applied. The only real difference that I can see is that the collapse button now appear for methods that are both unstable and depreciated: before after.

@steveklabnik
Copy link
Member

LGTM. Travis failure is irrelevant.

@bors: r+

Thanks!

@bors
Copy link
Contributor

bors commented Dec 22, 2016

📌 Commit e395fd1 has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented Dec 22, 2016

⌛ Testing commit e395fd1 with merge 8d1023b...

@bors
Copy link
Contributor

bors commented Dec 22, 2016

💔 Test failed - auto-mac-32-opt

@alexcrichton
Copy link
Member

alexcrichton commented Dec 25, 2016 via email

@bors
Copy link
Contributor

bors commented Dec 26, 2016

⌛ Testing commit e395fd1 with merge bb54588...

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Dec 26, 2016

⌛ Testing commit e395fd1 with merge eb34cb7...

@bors
Copy link
Contributor

bors commented Dec 26, 2016

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

@bors
Copy link
Contributor

bors commented Dec 27, 2016

⌛ Testing commit e395fd1 with merge fcc43fa...

@bors
Copy link
Contributor

bors commented Dec 27, 2016

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Dec 27, 2016 via email

@bors
Copy link
Contributor

bors commented Dec 27, 2016

⌛ Testing commit e395fd1 with merge e63300a...

@bors
Copy link
Contributor

bors commented Dec 27, 2016

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Dec 27, 2016 via email

@bors
Copy link
Contributor

bors commented Dec 27, 2016

⌛ Testing commit e395fd1 with merge 6e34629...

@bors
Copy link
Contributor

bors commented Dec 27, 2016

💔 Test failed - status-appveyor

@steveklabnik
Copy link
Member

Hmm, not sure if this failure is spurious or not.

@alexcrichton
Copy link
Member

alexcrichton commented Dec 27, 2016 via email

@bors
Copy link
Contributor

bors commented Dec 27, 2016

⌛ Testing commit e395fd1 with merge 314c28b...

bors added a commit that referenced this pull request Dec 27, 2016
rustdoc: Fix invalid HTML in stability notices

`em` tags cannot contain `p` tags so use `div`s instead of `em`s as the Markdown will create `p` tags.
@bors
Copy link
Contributor

bors commented Dec 27, 2016

☀️ Test successful - status-appveyor, status-travis
Approved by: steveklabnik
Pushing 314c28b to master...

@bors bors merged commit e395fd1 into rust-lang:master Dec 27, 2016
@ollie27 ollie27 deleted the rustdoc_stab_em_div branch December 28, 2016 20:17
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Dec 30, 2016
…frewsxcv

rustdoc: Fix broken CSS for trait items

The `stab` class shouldn't have any effect here so can be removed as currently it adds an outline.

This was accidentally caused by rust-lang#38329.

[before](https://doc.rust-lang.org/nightly/std/iter/trait.ExactSizeIterator.html) [after](https://ollie27.github.io/rust_doc_test/std/iter/trait.ExactSizeIterator.html)
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.

7 participants