jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341466 )
Change subject: Revert "CapsuleItemWidget: Add breathing space and use icon
instead of indicator" – breaks CapsuleMultiselectWidget with NumberInputWidget
popup
......................................................................
Revert "CapsuleItemWidget: Add breathing space and use icon instead of
indicator" – breaks CapsuleMultiselectWidget with NumberInputWidget popup
This reverts commit 4dae4448ec1a5929d7650b2c52438cb76f00cb28.
Change-Id: Ifdf50298cf12c1c1e587e0eaf864c20410252348
---
M src/themes/mediawiki/widgets.less
M src/widgets/CapsuleItemWidget.js
2 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index efb43ad..173c305 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -967,7 +967,7 @@
&-handle {
min-height: 2.4em;
.oo-ui-inline-spacing( 0.5em );
- padding: 0.625em;
+ padding: 0.15em 0.25em;
border: @border-default;
border-radius: @border-radius-default;
.oo-ui-box-sizing( border-box );
@@ -1057,18 +1057,18 @@
.oo-ui-box-sizing( border-box );
width: auto;
max-width: 100%;
- height: 2.3em;
- margin: 0 0.625em 0 0;
+ height: 1.7em;
+ margin: 0.1em;
border: @border-default;
border-radius: @border-radius-default;
- padding: 0.313em;
+ padding: 0 0.4em;
line-height: 1.7;
vertical-align: middle;
&.oo-ui-widget-enabled {
background-color: @background-color-framed;
color: @color-default;
- padding-right: @size-icon + 0.6em;
+ padding-right: @size-indicator + 0.6em;
.oo-ui-transition(
background-color @transition-ease-quick,
color @transition-ease-quick,
@@ -1098,10 +1098,10 @@
}
& .oo-ui-buttonElement-button {
display: block;
- width: @size-icon + 0.6em; // equals to `padding` on
each side of the indicator
+ width: @size-indicator + 0.6em; // equals to `padding`
on each side of the indicator
height: 100%; // Firefox height calculation fix
- & .oo-ui-icon-close {
+ & .oo-ui-indicator-clear {
position: absolute;
top: 0;
right: 0.3em;
diff --git a/src/widgets/CapsuleItemWidget.js b/src/widgets/CapsuleItemWidget.js
index 0a67656..5dc852b 100644
--- a/src/widgets/CapsuleItemWidget.js
+++ b/src/widgets/CapsuleItemWidget.js
@@ -28,7 +28,7 @@
// Events
this.closeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'close',
+ indicator: 'clear',
tabIndex: -1
} ).on( 'click', this.onCloseClick.bind( this ) );
--
To view, visit https://gerrit.wikimedia.org/r/341466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdf50298cf12c1c1e587e0eaf864c20410252348
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <volke...@wikimedia.org>
Gerrit-Reviewer: Catrope <r...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Prtksxna <psax...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
