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.

Sign up for GitHub

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

Jump to bottom

[beta] rustdoc: fix line numbers display for [src] pages #56819

Merged
merged 2 commits into from
Dec 18, 2018
Merged

[beta] rustdoc: fix line numbers display for [src] pages #56819

merged 2 commits into from
Dec 18, 2018

Conversation

QuietMisdreavus
Copy link
Member

Backporting #56498

Fixes #56720

r? @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 14, 2018
@QuietMisdreavus
Copy link
Member Author

Something i found while looking at the CSS that i missed on the original PR: there's another body:not(.source) right below the rules that were changed in the original. Should we fix that on master and here?

rust/src/librustdoc/html/static/rustdoc.css

Lines 308 to 310 in f4b07e0

body:not(.source) .example-wrap > pre {
margin: 0;
}

@GuillaumeGomez
Copy link
Member

Indeed, sending a PR right away!

@GuillaumeGomez GuillaumeGomez mentioned this pull request Dec 15, 2018
Merged
Centril added a commit to Centril/rust that referenced this pull request Dec 16, 2018
@Centril
Rollup merge of rust-lang#56844 - GuillaumeGomez:improve-css-rule, r=…
75d4eda 
…QuietMisdreavus

Improve CSS rule

Needed for rust-lang#56819.

r? @QuietMisdreavus
@QuietMisdreavus
Copy link
Member Author

I pushed a commit that includes the change from #56844.

@pietroalbini
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 17, 2018

📌 Commit 2179544 has been approved by pietroalbini

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 17, 2018
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Dec 17, 2018
@pietroalbini
Rollup merge of rust-lang#56819 - QuietMisdreavus:backport-src-lines-…
9d49d7d 
…fix r=pietroalbini
@pietroalbini pietroalbini mentioned this pull request Dec 17, 2018
Merged
@pietroalbini
Copy link
Member

Rolled this up.

bors added a commit that referenced this pull request Dec 18, 2018
@bors
Auto merge of #56930 - pietroalbini:beta-backports, r=pietroalbini
a1b9cf6 
[beta] Rollup backports

PRs accepted for backport:

* #56781: Update LLVM submodule
* #56615: Update the book to fix some edition-related bugs
* #56562: Update libc version required by rustc
* #56282: Fix #56237: normalize type before deferred sizedness checking.
* Release notes for Rust 1.31.1

Approved PRs targeting beta:

* #56819: [beta] rustdoc: fix line numbers display for [src] pages
* #56893: [beta] Revert "Update CI-clang to 7.0.0 for Linux dists."

r? @ghost
@bors bors merged commit 2179544 into rust-lang:beta Dec 18, 2018
@QuietMisdreavus QuietMisdreavus deleted the backport-src-lines-fix branch January 16, 2019 23:11
@QuietMisdreavus QuietMisdreavus mentioned this pull request Jan 16, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@GuillaumeGomez GuillaumeGomez

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@QuietMisdreavus @rust-highfive @GuillaumeGomez @pietroalbini @bors