Skip to content

move form option wrapper element inside kc-form-options#31223

Merged
edewit merged 1 commit into
keycloak:mainfrom
DevDuki:correctly-wrap-form-options-in-login-password
Jul 22, 2024
Merged

move form option wrapper element inside kc-form-options#31223
edewit merged 1 commit into
keycloak:mainfrom
DevDuki:correctly-wrap-form-options-in-login-password

Conversation

@DevDuki

@DevDuki DevDuki commented Jul 11, 2024

Copy link
Copy Markdown
Contributor

closes #31216

@DevDuki DevDuki requested review from a team as code owners July 11, 2024 13:46
@thomasdarimont

Copy link
Copy Markdown
Contributor

@DevDuki thanks for your PR! Could you please add the DCR (sign off information to your commit?)

git commit --amend --signoff

@thomasdarimont

thomasdarimont commented Jul 17, 2024

Copy link
Copy Markdown
Contributor

Could you perhaps rebase your commit on top of the current main instead of doing a merge commit?

git checkout main
git pull upstream main --rebase

Remove the merge commit, e.g. by doing:

git rebase -i HEAD~2
comment out the line with the merge commit
exit the editor,e .g. `:wq`

then

git checkout correctly-wrap-form-options-in-login-password
git rebase main
git commit --amend --signoff

Then git push -f origin correctly-wrap-form-options-in-login-password

@DevDuki DevDuki force-pushed the correctly-wrap-form-options-in-login-password branch 2 times, most recently from 2c54443 to 126c12a Compare July 17, 2024 08:04
closes keycloak#31216

Signed-off-by: Dusan Misic <dusan.misic@inventage.com>
@DevDuki DevDuki force-pushed the correctly-wrap-form-options-in-login-password branch from 126c12a to b57a5d0 Compare July 17, 2024 08:07
@edewit edewit merged commit 10fc2e9 into keycloak:main Jul 22, 2024
@DevDuki DevDuki deleted the correctly-wrap-form-options-in-login-password branch July 23, 2024 05:56
stianst pushed a commit to stianst/keycloak that referenced this pull request Jul 25, 2024
closes keycloak#31216

Signed-off-by: Dusan Misic <dusan.misic@inventage.com>
Co-authored-by: Dusan Misic <dmisic@inventage.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

#kc-form-options div not wrapping its content correctly in login-password.ftl

3 participants