Skip to content

Fix image positioning #416

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

Merged
merged 4 commits into from
Oct 22, 2019
Merged

Fix image positioning #416

merged 4 commits into from
Oct 22, 2019

Conversation

jplatte
Copy link
Contributor

@jplatte jplatte commented Oct 8, 2019

If the first and/or last commit are unwanted, I can force-push a version with just the actual image positioning changes (or you can cherry-pick those two commits).

fixes #414

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@jplatte
Copy link
Contributor Author

jplatte commented Oct 8, 2019

The thumbnail classes are added back via raw html, which is labeled 'unsafe' in comrak. AFAIK, it should be perfectly fine as long as only trusted markdown input is processed though.

@nikomatsakis
Copy link
Contributor

Thanks @jplatte ! Unfortunately, there are now merge conflicts, maybe you can rebase?

@jplatte
Copy link
Contributor Author

jplatte commented Oct 11, 2019

Of course. I was expecting the merge conflicts even when opening the PR, but forgot to update this one after the other one was merged 😅

I've fixed the conflicts now.

@nikomatsakis
Copy link
Contributor

@jplatte thanks for fixing the conflicts -- can you however use a rebase instead of a merge commit? (Although I wonder if GH's "rebase and merge" or "squash and merge" options would do that for you)

@jplatte
Copy link
Contributor Author

jplatte commented Oct 18, 2019

Yeah I can rebase later. Unfortunately I can't do it in the web interface. Rebase and merge / squash and merge are only available to people with write access, and if there are no conflicts.

@jplatte
Copy link
Contributor Author

jplatte commented Oct 18, 2019

@nikomatsakis done

@nikomatsakis nikomatsakis merged commit 7e81e1b into rust-lang:master Oct 22, 2019
@nikomatsakis
Copy link
Contributor

Thanks @jplatte !

@jplatte jplatte deleted the image-positioning branch October 22, 2019 19:22
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.

"Increasing Rust's Reach" post broken since markdown renderer switch
4 participants