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

Use new template for wagtail >= 4 #196

Merged

Conversation

th3hamm0r
Copy link
Contributor

@th3hamm0r th3hamm0r commented Nov 21, 2022

This fixes crashes due to a reference to a non-existent CSS file (removed in wagtail >= 4.0), but also tries to adapt the html based on the latest login.html.

See #187

Note:
I've copied the last version of otp_form.html to a legacy folder, and adapted the template for the new requirements.
On the frontend, the output is not optimal yet (secondary button has some margin), but at least it does not crash.

wagtail_2fa_wagtail_4_fixes

This fixes crashes due to a reference to a non-existent CSS file, but
also tries to adapt the html based on the latest login.html.

See labd#187
@th3hamm0r th3hamm0r mentioned this pull request Nov 21, 2022
@davisnando
Copy link
Member

@th3hamm0r Can you fix the conflicts and fix the margin as well?

@th3hamm0r
Copy link
Contributor Author

@davisnando I've now fixed the conflicts.
Unfortunately, I don't have a clean solution for the margin atm. Initially, I've tried to find wagtail css classes or components, but I wasn't successful. So maybe someone else could fix that (e.g. using a new ticket/PR).

@davisnando davisnando merged commit f029a7c into labd:master Nov 23, 2022
@tjwalch
Copy link

tjwalch commented Dec 19, 2022

@davisnando @th3hamm0r I fixed the margins in #203 . Did not use any builtin classes, just added som styling in extra_css block

@zerolab zerolab mentioned this pull request Jan 17, 2023
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.

3 participants