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-22191: Account disabling and password changing action links should be buttons #3148

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+7 −5
Open

XWIKI-22191: Account disabling and password changing action links should be buttons #3148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06051b7
XWIKI-22191: Account disabling and password changing action links sho…
Sereza7 May 30, 2024
7dcb59e
XWIKI-22191: Account disabling and password changing action links sho…
Sereza7 May 30, 2024
617518d
XWIKI-22191: Account disabling and password changing action links sho…
Sereza7 May 30, 2024
d043470
XWIKI-22191: Account disabling and password changing action links sho…
Sereza7 Nov 27, 2024
86dfba4
Merge branch 'master' into XWIKI-22191
Sereza7 Nov 27, 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
8 changes: 5 additions & 3 deletions ...skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/general.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,11 @@ body {
}
}

/* Remove the underlining from links with the btn class.
Those are already styled differently from their neighboring text. */
& a.btn {
/* Remove the underlining from links styled like buttons.
Those are already different enough from their neighboring text. */
& a.btn,
& a.button,
& .buttonwrapper a {
.not-inline-link();
}

Expand Down
4 changes: 2 additions & 2 deletions ...profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserProfileSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,8 @@ $services.localization.render('platform.core.profile.category.profile.disabled')
#set ($enableClass = "hidden")
#set ($disableClass = "")
#end
<a href="#" id="enable" class="btn btn-success $enableClass">$services.icon.renderHTML('unlock') $services.localization.render('platform.core.profile.category.profile.enableAccount')</a>
<a href="#" id="disable" class="btn btn-warning $disableClass">$services.icon.renderHTML('lock') $services.localization.render('platform.core.profile.category.profile.disableAccount')</a>
<button id="enable" class="btn btn-success $enableClass">$services.icon.renderHTML('unlock') $services.localization.render('platform.core.profile.category.profile.enableAccount')</button>
<button id="disable" class="btn btn-warning $disableClass">$services.icon.renderHTML('lock') $services.localization.render('platform.core.profile.category.profile.disableAccount')</button>
#end
<div class='userInfo'>
#if($xcontext.action == 'view' && $hasEdit)
Expand Down