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

fix serving custom CSS coming from --extend-css in rustdoc #2525

Merged
merged 1 commit into from
Jun 21, 2024

Conversation

syphar
Copy link
Member

@syphar syphar commented Jun 21, 2024

Resolves #2524

The CSS content from --extend-css ends up in a theme.css in the rustdoc output.

We have to serve these similar to invocation specific JS files.

I added a test testing for both custom JS & CSS files, also validated locally that the bug in #2524 is fixed

@syphar syphar requested a review from a team as a code owner June 21, 2024 09:57
@syphar syphar self-assigned this Jun 21, 2024
@github-actions github-actions bot added the S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed label Jun 21, 2024
@GuillaumeGomez
Copy link
Member

I thought this case was handled already. Good catch!

@syphar syphar merged commit b1b4ddc into rust-lang:master Jun 21, 2024
11 checks passed
@syphar syphar deleted the serve-release-css-on-top-of-js branch June 21, 2024 11:11
@github-actions github-actions bot added S-waiting-on-deploy This PR is ready to be merged, but is waiting for an admin to have time to deploy it and removed S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed labels Jun 21, 2024
@hedgecrw
Copy link

Thanks for the quick fix everyone! One quick question/request...is there a way to manually trigger a re-build of the current docs for a release, or will I need to just up the version number and republish to take advantage of this fix?

@syphar
Copy link
Member Author

syphar commented Jun 21, 2024

It's actually option 3 :

We still only manually deploy docs.rs, which is why we have this "waiting for deploy" label.

I'll probably do a deploy tomorrow or the day after, then everything should directly be fine.

@hedgecrw
Copy link

Perfect, thanks again

@syphar
Copy link
Member Author

syphar commented Jun 23, 2024

@hedgecrw the code is deployed, everything should work now, can you confirm?

@syphar syphar removed the S-waiting-on-deploy This PR is ready to be merged, but is waiting for an admin to have time to deploy it label Jun 23, 2024
@hedgecrw
Copy link

I can confirm that everything now looks correct.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Custom CSS from --extend-css doesn't work
3 participants