Jforrester has submitted this change and it was merged.
Change subject: NumberInputWidget: Fix rounded corners when showButtons=false
......................................................................
NumberInputWidget: Fix rounded corners when showButtons=false
Change-Id: Iad71b2a27dcbde45cbe93b11e485dff7d9bb6d10
---
M demos/pages/widgets.js
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
M src/widgets/NumberInputWidget.js
4 files changed, 11 insertions(+), 3 deletions(-)
Approvals:
Jforrester: Verified; Looks good to me, approved
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index d4e4e96..2820c58 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -790,6 +790,13 @@
}
),
new OO.ui.FieldLayout(
+ new OO.ui.NumberInputWidget( {
showButtons: false } ),
+ {
+ label: 'NumberInputWidget (no
buttons)',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
new OO.ui.ToggleSwitchWidget(),
{
label: 'ToggleSwitchWidget',
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 9808c7a..f481bc7 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -984,7 +984,7 @@
border-left-width: 0;
}
- .oo-ui-textInputWidget input {
+ &-buttoned .oo-ui-textInputWidget input {
border-radius: 0;
}
}
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 4b72e39..aea985f 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -1173,7 +1173,7 @@
border-left-width: 0;
}
- .oo-ui-textInputWidget input {
+ &-buttoned .oo-ui-textInputWidget input {
border-radius: 0;
}
}
diff --git a/src/widgets/NumberInputWidget.js b/src/widgets/NumberInputWidget.js
index 603a63c..91022ff 100644
--- a/src/widgets/NumberInputWidget.js
+++ b/src/widgets/NumberInputWidget.js
@@ -99,12 +99,13 @@
this.$field = $( '<div>' ).addClass( 'oo-ui-numberInputWidget-field' )
.append( this.input.$element );
+ this.$element.addClass( 'oo-ui-numberInputWidget' ).append( this.$field
);
if ( config.showButtons ) {
this.$field
.prepend( this.minusButton.$element )
.append( this.plusButton.$element );
+ this.$element.addClass( 'oo-ui-numberInputWidget-buttoned' );
}
- this.$element.addClass( 'oo-ui-numberInputWidget' ).append( this.$field
);
this.input.setValidation( this.validateNumber.bind( this ) );
};
--
To view, visit https://gerrit.wikimedia.org/r/278870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad71b2a27dcbde45cbe93b11e485dff7d9bb6d10
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
