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

Upgrade normalize.css to v8.0.1 #86725

Merged
merged 2 commits into from
Jun 29, 2021
Merged

Conversation

JohnTitor
Copy link
Member

Fixes #86629, this addresses #82548 and #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.

Before

before 1
before 2

After

after 1
after 2

r? @jsha

@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 29, 2021
}

/* end tweaks for normalize.css 8 */

details:not(.rustdoc-toggle) summary {
margin-bottom: .6em;
Copy link
Member Author

Choose a reason for hiding this comment

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

NOTE: margin-bottom is still required.

@GuillaumeGomez
Copy link
Member

Let's go with it and hope for the best I guess. Thanks!

@bors: r+

@bors
Copy link
Contributor

bors commented Jun 29, 2021

📌 Commit 5101078 has been approved by GuillaumeGomez

@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 Jun 29, 2021
@bors
Copy link
Contributor

bors commented Jun 29, 2021

⌛ Testing commit 5101078 with merge 6d82086...

@bors
Copy link
Contributor

bors commented Jun 29, 2021

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 6d82086 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 29, 2021
@bors bors merged commit 6d82086 into rust-lang:master Jun 29, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 29, 2021
@JohnTitor JohnTitor deleted the normalizecss-8 branch June 30, 2021 06:49
@JohnTitor
Copy link
Member Author

At a glance, I've noticed two changes:

Beta

beta 1
beta 2

Nightly

nightly 1
nightly 2

The deprecation note width seems fine to me (actually, I messed up the screenshots on OP, sorry), but I'm happy to restore the original.

The problem is the second, I think it's a regression and we should fix. But somehow I couldn't find it on testing. I generated the docs via ./x.py doc library/std but it's different from the actual?

@GuillaumeGomez I'd like to hear your thoughts.

@GuillaumeGomez
Copy link
Member

Please reset the deprecation notice. As for the position of the labels, it comes from this PR, so nothing to change on your side.

@dns2utf8: Can we somehow fix the labels position while keeping them in the text by any chance?

The problem is the second, I think it's a regression and we should fix. But somehow I couldn't find it on testing. I generated the docs via ./x.py doc library/std but it's different from the actual?

Try emptying your cache? Otherwise the command line seems good to me.

@JohnTitor
Copy link
Member Author

Alright, then I'll fix the first one later, thanks for checking!

@dns2utf8
Copy link
Contributor

dns2utf8 commented Jun 30, 2021

My changes were quite substantial and you must empty your css cache this time.
I am not 100% sure what you mean by "the second". Do you mean the shape of the coloured boxes for the "Deprecated" and similar labels?

They look like the ones currently on stable
image

and they do not overlap with the current nightly.

Update

Except for their position, which I changed because of mobile viewers.

@GuillaumeGomez
Copy link
Member

@dns2utf8 Yes, I was talking about the position. They are supposed to be positionned like the screenshot you provided. Do you think it's possible to keep them this way? If it requires too much changes, let's keep them as is.

@dns2utf8
Copy link
Contributor

Moving the tags back to the right would be a big undertaking and to keep the benefits for mobile users and not reverting #86594
We could try to align the tags on the right side of the left column but I fear that could make it harder to read

@GuillaumeGomez
Copy link
Member

We could apply a "flex" style so that the left column first item (so before the "Experimental" and other labels) has the same width for all items when not on mobile?

@dns2utf8
Copy link
Contributor

A flex layout in the left column could work, yes. Let us open an issue to focus there 👍

@GuillaumeGomez
Copy link
Member

I let you do that then (odn't forget to ping me on it so I can add the tags). ;)

@JohnTitor
Copy link
Member Author

After some investigating, turned out the first one also wasn't caused by this PR but #85970: https://github.com/rust-lang/rust/pull/85970/files#diff-7dc22a0530802d77c2f2ec9e834024a5657b6eab4055520fca46edc99a544413L855
If we re-add display: table to the .stab class, the width is restored. But I'm not sure if it was intentional or by accident.
@GuillaumeGomez Do you still want to restore it? If so, I'm happy to open a PR.

@dns2utf8
Copy link
Contributor

I think the .stab problem has been solved already. However, I did not look into how exactly:
https://doc.rust-lang.org/nightly/std/primitive.array.html#method.zip
image

@GuillaumeGomez
Copy link
Member

I just checked on stable to ensure we were doing the right thing and apparently we're not:

Screenshot from 2021-07-01 10-14-55

However, I kinda like it as it is...

@JohnTitor
Copy link
Member Author

@GuillaumeGomez So, let's say we do not restore (shrink) it for now?

@GuillaumeGomez
Copy link
Member

I'm good either way.

@JohnTitor
Copy link
Member Author

Hmm alright, then I'll tweak it when someone issues it.

notriddle added a commit to notriddle/rust that referenced this pull request Sep 26, 2022
This was added in 5101078, to fix
the display of the module items and search results tables (see the discussion
in rust-lang#86725).

Those aren't tables any more. The only remaining table is in docblock, which
has its own padding declarations.
notriddle added a commit to notriddle/rust that referenced this pull request Sep 26, 2022
This was added in 5101078, to fix the
display of the module items and search results tables (see the discussion in
rust-lang#86725).

Those aren't tables any more. The only remaining table is in docblock, which
needs this attribute to look right.
notriddle added a commit to notriddle/rust that referenced this pull request Sep 26, 2022
…aumeGomez

rustdoc: merge CSS `table` rules into `.docblock`

This was added in 5101078, to fix the display of the module items and search results tables (see the discussion in rust-lang#86725).

Those aren't tables any more. The only remaining table is in docblock, which has its own padding declarations.
notriddle added a commit to notriddle/rust that referenced this pull request Sep 26, 2022
…aumeGomez

rustdoc: merge CSS `table` rules into `.docblock`

This was added in 5101078, to fix the display of the module items and search results tables (see the discussion in rust-lang#86725).

Those aren't tables any more. The only remaining table is in docblock, which has its own padding declarations.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustdoc: upgrade or remove normalize.css
7 participants