jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.ui: Button group active buttons unchanged on user
interaction
......................................................................
mediawiki.ui: Button group active buttons unchanged on user interaction
Applying default cursor and making active button's hover state behave same
as normal state for improved user experience.
Bug: T77916
Depends-On: Ib89500d70b3e79edcf9ba989f05a311e0edec82b
Change-Id: I8fd74c28ccb89df1e257aa3d63d362697c4542ed
---
M resources/src/mediawiki.less/mediawiki.ui/mixins.less
M resources/src/mediawiki.ui/components/buttons.less
2 files changed, 22 insertions(+), 15 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
index 1b31956..93b7265 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
@@ -53,6 +53,7 @@
}
&:active,
+ &.is-on,
&.mw-ui-checked {
background: @activeColor;
box-shadow: none;
diff --git a/resources/src/mediawiki.ui/components/buttons.less
b/resources/src/mediawiki.ui/components/buttons.less
index 71febe3..40a67c5 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -253,29 +253,35 @@
//
// Markup:
// <div class="mw-ui-button-group">
-// <div class="mw-ui-button">A</div>
+// <div class="mw-ui-button is-on">A</div>
// <div class="mw-ui-button">B</div>
// <div class="mw-ui-button">C</div>
// <div class="mw-ui-button">D</div>
// </div><div style="clear:both"></div>
//
// Styleguide 2.2.
-.mw-ui-button-group > * {
- min-width: 48px;
- border-radius: 0;
- float: left;
+.mw-ui-button-group {
+ & > * {
+ min-width: 48px;
+ border-radius: 0;
+ float: left;
- &:first-child {
- border-top-left-radius: @borderRadius;
- border-bottom-left-radius: @borderRadius;
+ &:first-child {
+ border-top-left-radius: @borderRadius;
+ border-bottom-left-radius: @borderRadius;
+ }
+
+ &:not( :first-child ) {
+ border-left: 0;
+ }
+
+ &:last-child {
+ border-top-right-radius: @borderRadius;
+ border-bottom-right-radius: @borderRadius;
+ }
}
- &:not( :first-child ) {
- border-left: 0;
- }
-
- &:last-child{
- border-top-right-radius: @borderRadius;
- border-bottom-right-radius: @borderRadius;
+ & .is-on .button {
+ cursor: default;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/272681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fd74c28ccb89df1e257aa3d63d362697c4542ed
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
