Skip to content

Fix search result colors #102369

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Sep 28, 2022
Merged

Fix search result colors #102369

merged 2 commits into from
Sep 28, 2022

Conversation

GuillaumeGomez
Copy link
Member

Fixes regression introduced in 99c0071.

As you can see, ayu lost some colors for its search results:

beta/nightly:
Screenshot from 2022-09-27 19-46-49

stable:
Screenshot from 2022-09-27 19-46-36

We'll need to backport it to beta too to prevent it reaching stable.

r? @notriddle

@GuillaumeGomez GuillaumeGomez added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-ui Area: Rustdoc UI (generated HTML) labels Sep 27, 2022
@rustbot
Copy link
Collaborator

rustbot commented Sep 27, 2022

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @Folyd, @jsha

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 27, 2022
Copy link
Contributor

@notriddle notriddle left a comment

Choose a reason for hiding this comment

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

r=me when CI passes

@notriddle notriddle added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 27, 2022
@GuillaumeGomez
Copy link
Member Author

@bors r=notriddle rollup

@bors
Copy link
Collaborator

bors commented Sep 27, 2022

📌 Commit a925e20 has been approved by notriddle

It is now in the queue for this repository.

@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 Sep 27, 2022
@apiraino
Copy link
Contributor

Beta backport accepted, an easy win to be backported (instead of waiting until the next release cycle)

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 27, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 27, 2022
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#101555 (Stabilize `#![feature(mixed_integer_ops)]`)
 - rust-lang#102253 (rustdoc: use CSS containment to speed up render)
 - rust-lang#102281 (make invalid_value lint a bit smarter around enums)
 - rust-lang#102284 (Structured suggestion for missing `mut`/`const` in raw pointer)
 - rust-lang#102330 (rustdoc: remove no-op CSS `.srclink { font-weight; font-size }`)
 - rust-lang#102337 (Avoid LLVM-deprecated `Optional::hasValue`)
 - rust-lang#102356 (session: remove now-unnecessary lint `#[allow]`s)
 - rust-lang#102367 (rustdoc: remove redundant `#help-button` CSS)
 - rust-lang#102369 (Fix search result colors)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f28ac30 into rust-lang:master Sep 28, 2022
@rustbot rustbot added this to the 1.66.0 milestone Sep 28, 2022
@GuillaumeGomez GuillaumeGomez deleted the results-colors branch September 28, 2022 14:08
@cuviper
Copy link
Member

cuviper commented Oct 4, 2022

This fix seems to depend on #101934, which is not on the beta branch for 1.65. Can you help with a beta backport?

(That other one is on the 1.65.0 milestone though -- cc @Mark-Simulacrum for the apparent bot failure.)

@GuillaumeGomez
Copy link
Member Author

Is it a merge conflict or something else?

@cuviper
Copy link
Member

cuviper commented Oct 4, 2022

Clarified the change dependency in PM -- we agreed to nominate the other one too.

@cuviper cuviper mentioned this pull request Oct 4, 2022
@cuviper cuviper modified the milestones: 1.66.0, 1.65.0 Oct 4, 2022
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 4, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 10, 2022
[beta] backports

* Avoid duplicating StorageLive in let-else rust-lang#101894
* Re-add HRTB implied static bug note rust-lang#101924
* Revert "Copy stage0 binaries into stage0-sysroot" rust-lang#101942
* implied_bounds: deal with inference vars rust-lang#102016
* fix ConstProp handling of written_only_inside_own_block_locals rust-lang#102045
* Fix wrongly refactored Lift impl rust-lang#102088
* Fix a typo “pararmeter” in error message rust-lang#102119
* Deny associated type bindings within associated type bindings rust-lang#102338
* Continue migration of CSS themes rust-lang#101934
* Fix search result colors rust-lang#102369
* Fix unwind drop glue for if-then scopes rust-lang#102394
* Revert "Use getentropy when possible on all Apple platforms" rust-lang#102693
* Fix associated type bindings with anon const in GAT position rust-lang#102336
* Revert perf-regression 101620 rust-lang#102064
* `EscapeAscii` is not an `ExactSizeIterator` rust-lang#99880
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-rustdoc-ui Area: Rustdoc UI (generated HTML) beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants