Skip to content

Commit

Permalink
Auto merge of rust-lang#86725 - JohnTitor:normalizecss-8, r=Guillaume…
Browse files Browse the repository at this point in the history
…Gomez

Upgrade normalize.css to v8.0.1

Fixes rust-lang#86629, this addresses rust-lang#82548 and rust-lang#82542 with tweaks. I expect that this changes the style *slightly* but shouldn't have any major changes.
Here's some changes I observed, I'd say they all are an improvement.

<details>
<summary>Before</summary>

![before 1](https://user-images.githubusercontent.com/25030997/123854746-0fc84800-d95a-11eb-8484-ea86dfe0ae14.png)
![before 2](https://user-images.githubusercontent.com/25030997/123854754-135bcf00-d95a-11eb-8cca-f49994629e08.png)

</details>

<details>
<summary>After</summary>

![after 1](https://user-images.githubusercontent.com/25030997/123854809-21115480-d95a-11eb-9dd2-0d3b9ca45edd.png)
![after 2](https://user-images.githubusercontent.com/25030997/123854818-22428180-d95a-11eb-83aa-fb5a698124f9.png)

</details>

r? `@jsha`
  • Loading branch information
bors committed Jun 29, 2021
2 parents 6e0b554 + 5101078 commit 6d82086
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/librustdoc/html/static/normalize.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 23 additions & 2 deletions src/librustdoc/html/static/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,31 @@ summary {
outline: none;
}

/* FIXME: Remove after normalize.css is either upgraded or removed (#86629) */
/* Fix some style changes due to normalize.css 8 */

td,
th {
padding: 0;
}

table {
border-collapse: collapse;
}

button,
input,
optgroup,
select,
textarea {
color: inherit;
font: inherit;
margin: 0;
}

/* end tweaks for normalize.css 8 */

details:not(.rustdoc-toggle) summary {
margin-bottom: .6em;
display: list-item;
}

code, pre, a.test-arrow {
Expand Down

0 comments on commit 6d82086

Please sign in to comment.