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

XWIKI-18816: Useless and somewhat invalid <dt> markup on the login form #3379

Merged
merged 2 commits into from
Oct 16, 2024
Merged

XWIKI-18816: Useless and somewhat invalid <dt> markup on the login form #3379

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b2fee4
XWIKI-18816: Useless and somewhat invalid <dt> markup on the login form
Sereza7 Aug 29, 2024
636b1f9
XWIKI-18816: Useless and somewhat invalid <dt> markup on the login form
Sereza7 Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...go-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/misc.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ div.suggestItems .hide-button {
margin-top: .3em;
}
.submitSection {
margin-top: floor(@font-size-base * 1.4); // Same as `.xform dl dt`
Copy link
Contributor

Choose a reason for hiding this comment

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

Minor comment, I think we normally put comments on their own line in our code style.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Addressed in 636b1f9 👍

display: flex;
flex-flow: row wrap;
gap: 1em;
Expand Down
24 changes: 12 additions & 12 deletions ...flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/login.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@
$supplementaryForm
</div>
#end
<dt class="submitSection">
<input type="submit" class="btn btn-primary col-xs-12" value="$escapetool.xml($services.localization.render('login'))"/>
</dl>
<div class="submitSection">
<input type="submit" class="btn btn-primary col-xs-12" value="$escapetool.xml($services.localization.render('login'))"/>

#set ($forgotUsernameURL = $services.security.authentication.getAuthenticationURL('retrieveusername', $NULL))
#if("$!forgotUsernameURL" != "")
<span class="xAdditional"><a href="$forgotUsernameURL">$escapetool.xml($services.localization.render('xe.admin.forgotUsername.loginMessage'))</a></span>
#end
#set ($resetPasswordUrl = $services.security.authentication.getAuthenticationURL('resetpassword', $NULL))
#if("$!resetPasswordUrl" != '')
<span class="xAdditional recoverPassword"><a href="$resetPasswordUrl" >$escapetool.xml($services.localization.render('xe.admin.passwordReset.loginMessage'))</a></span>
#end
</dt>
</dl>
#set ($forgotUsernameURL = $services.security.authentication.getAuthenticationURL('retrieveusername', $NULL))
#if("$!forgotUsernameURL" != "")
<span class="xAdditional"><a href="$forgotUsernameURL">$escapetool.xml($services.localization.render('xe.admin.forgotUsername.loginMessage'))</a></span>
#end
#set ($resetPasswordUrl = $services.security.authentication.getAuthenticationURL('resetpassword', $NULL))
#if("$!resetPasswordUrl" != '')
<span class="xAdditional recoverPassword"><a href="$resetPasswordUrl" >$escapetool.xml($services.localization.render('xe.admin.passwordReset.loginMessage'))</a></span>
#end
</div>
#xwikimessageboxend()
</form>
</main>## mainContentArea
Expand Down