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

Use CSS variables to handle theming #98460

Merged
merged 2 commits into from
Jul 2, 2022
Merged

Use CSS variables to handle theming #98460

merged 2 commits into from
Jul 2, 2022

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jun 24, 2022 •
edited
Loading

This is the start for our simplification of theming. Considering how big the diff quickly becomes, I think it's better to do it in multiple parts.

Normally they shouldn't be any UI changes. You can check it here.

cc @notriddle
r? @jsha

@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 Jun 24, 2022
@rust-highfive
Copy link
Collaborator

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 Jun 24, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member Author

Forgot to remove some rules in light.css...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jun 26, 2022

☔ The latest upstream changes (presumably #98545) made this pull request unmergeable. Please resolve the merge conflicts.

jsha
jsha requested changes Jun 26, 2022
View reviewed changes
Copy link
Contributor

@jsha jsha left a comment

Choose a reason for hiding this comment

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

Generally looks good and I like the direction. Needs rebase.

src/librustdoc/html/static/css/rustdoc.css Outdated Show resolved Hide resolved
src/librustdoc/html/static/css/themes/light.css Outdated Show resolved Hide resolved
@rustbot
Copy link
Collaborator

rustbot commented Jun 28, 2022

A change occurred in the Ayu theme.

cc @Cldfire

@GuillaumeGomez
Copy link
Member Author

Updated (also updated the demo).

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Jul 1, 2022 •
edited
Loading

Since I applied all comments, let's move forward.

@bors r=jsha rollup

@GuillaumeGomez
Copy link
Member Author

Second try?

@bors r=jsha rollup

@bors
Copy link
Contributor

bors commented Jul 1, 2022

📌 Commit 7f6ce7d has been approved by jsha

@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 Jul 1, 2022
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 1, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 1, 2022
@bors
Auto merge of rust-lang#98781 - GuillaumeGomez:rollup-798kb8u, r=Guil…
9a6fa4f 
…laumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#97249 (`<details>`/`<summary>` UI fixes)
 - rust-lang#98418 (Allow macOS to build LLVM as shared library)
 - rust-lang#98460 (Use CSS variables to handle theming)
 - rust-lang#98497 (Improve some inference diagnostics)
 - rust-lang#98708 (rustdoc: fix 98690 Panic if invalid path for -Z persist-doctests)

Failed merges:

 - rust-lang#98761 (more `need_type_info` improvements)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bda659e into rust-lang:master Jul 2, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 2, 2022
@GuillaumeGomez GuillaumeGomez deleted the css-simplification branch July 2, 2022 09:34
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 11, 2022
Merged
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 13, 2022
@GuillaumeGomez
Rollup merge of rust-lang#99152 - GuillaumeGomez:css-theme-var, r=jsha
3b30cce 
Use CSS variables to handle theming (part 2)

Follow-up of rust-lang#98460.

As usual, there shouldn't be any UI change.

You can test it [here](https://rustdoc.crud.net/imperio/css-theme-var/bar/index.html).

r? `@jsha`
@GuillaumeGomez GuillaumeGomez mentioned this pull request Sep 12, 2022
Merged
This was referenced Sep 12, 2022
Merged
Merged
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 17, 2022
@matthiaskrgr
Rollup merge of rust-lang#101934 - GuillaumeGomez:theme-links-cleanup…
0840044 
…, r=notriddle

Continue migration of CSS themes

Now that rust-lang#101898 has been merged, we can move forward.

This PR moves more CSS theme rules as CSS variables. I also added a GUI test to prevent regressions.

Part of rust-lang#98460.

r? `@notriddle`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 17, 2022
@matthiaskrgr
Rollup merge of rust-lang#101934 - GuillaumeGomez:theme-links-cleanup…
1f31bee 
…, r=notriddle

Continue migration of CSS themes

Now that rust-lang#101898 has been merged, we can move forward.

This PR moves more CSS theme rules as CSS variables. I also added a GUI test to prevent regressions.

Part of rust-lang#98460.

r? ``@notriddle``
@GuillaumeGomez GuillaumeGomez mentioned this pull request Sep 24, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 1, 2022
@bors
Auto merge of rust-lang#102237 - GuillaumeGomez:sidebar-links-color, …
277bb66 
…r=notriddle

Migrate sidebar links color to CSS variables and unify themes with ayu

Part of rust-lang#98460.

This PR does two things:
 1. Migrate more theme CSS rules toward CSS variables.
 2. Remove `a.current` specific colors depending on the kind of the item behind the link. The `ayu` theme was already doing it this way and I think it makes much more sense like this.

You can test it [here](https://rustdoc.crud.net/imperio/sidebar-links-color/lib2/struct.Foo.html) by hovering other module's items in the sidebar (or check the selector `a.current`).

cc `@jsha`
r? `@notriddle`
This was referenced Oct 1, 2022
Merged
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 3, 2022
@matthiaskrgr
Rollup merge of rust-lang#102620 - GuillaumeGomez:css-stab-migration,…
d329213 
… r=notriddle

Migrate `.stab` elements style to CSS variables

Part of rust-lang#98460.

There should be no UI changes.

r? `@notriddle`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 4, 2022
@matthiaskrgr
Rollup merge of rust-lang#102547 - GuillaumeGomez:migrate-css-theme-s…
f333436 
…earch-result, r=notriddle,jsha

Migrate CSS theme for search results

Part of rust-lang#98460.

Just like rust-lang#102237, I unified theme to how the `ayu` handles this one: only one color for the background when search results are focused or hovered.

You can test it [here](https://rustdoc.crud.net/imperio/migrate-css-theme-search-result/lib2/index.html?search=coo).

cc `@jsha`
r? `@notriddle`

PS: The repetition in GUI tests is getting out of hand so I opened GuillaumeGomez/browser-UI-test#363 to think about adding possibility to declare functions so we can greatly improve this.
This was referenced Oct 4, 2022
Closed
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 6, 2022
@matthiaskrgr
Rollup merge of rust-lang#102736 - GuillaumeGomez:search-input-color,…
48964bd 
… r=notriddle

Migrate search input color to CSS variable

Part of rust-lang#98460.

No UI changes.

r? `@notriddle`
This was referenced Oct 26, 2022
Merged
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 28, 2022
@matthiaskrgr
Rollup merge of rust-lang#103585 - GuillaumeGomez:source-line-css, r=…
cfa2234 
…notriddle

Migrate source line numbers CSS to CSS variables

Part of rust-lang#98460.

No UI changes.

r? `@notriddle`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 28, 2022
@matthiaskrgr
Rollup merge of rust-lang#103585 - GuillaumeGomez:source-line-css, r=…
6e1613a 
…notriddle

Migrate source line numbers CSS to CSS variables

Part of rust-lang#98460.

No UI changes.

r? ``@notriddle``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsha jsha jsha requested changes

Assignees

@jsha jsha

Labels
A-rustdoc-ui Area: Rustdoc UI (generated HTML) 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
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.
6 participants
@GuillaumeGomez @rust-highfive @rust-log-analyzer @bors @rustbot @jsha