jenkins-bot has submitted this change and it was merged.
Change subject: TextInputWidget: Ensure icon+indicator+label are top aligned in
multiline mode
......................................................................
TextInputWidget: Ensure icon+indicator+label are top aligned in multiline mode
Also remove style for unused class oo-ui-textInputWidget-icon.
Bug: T114047
Change-Id: Ie1b3163b017f2f5daabe1fbad141b7e908401c21
---
M demos/pages/widgets.js
M demos/widgets.php
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
4 files changed, 30 insertions(+), 8 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index dd4be8c..b2d5f51 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -882,6 +882,20 @@
),
new OO.ui.FieldLayout(
new OO.ui.TextInputWidget( {
+ multiline: true,
+ autosize: true,
+ icon: 'tag',
+ indicator: 'required',
+ label: 'Inline label',
+ value:
'Autosize\nAutosize\nAutosize\nAutosize'
+ } ),
+ {
+ label: 'TextInputWidget
(autosize, icon, indicator, label)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.TextInputWidget( {
icon: 'tag',
indicator: 'alert',
value: 'Text input with label',
diff --git a/demos/widgets.php b/demos/widgets.php
index 191e1de..d55f3a5 100644
--- a/demos/widgets.php
+++ b/demos/widgets.php
@@ -642,6 +642,18 @@
)
),
new OOUI\FieldLayout(
+ new
OOUI\TextInputWidget( array(
+ 'multiline' =>
true,
+ 'value' =>
"Multiline\nMultiline",
+ 'icon' => 'tag',
+ 'indicator' =>
'required'
+ ) ),
+ array(
+ 'label' =>
"TextInputWidget (multiline, icon, indicator)\xE2\x80\x8E",
+ 'align' => 'top'
+ )
+ ),
+ new OOUI\FieldLayout(
new
OOUI\DropdownInputWidget( array(
'options' =>
array(
array(
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 49bc2a7..80f7688 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -396,10 +396,6 @@
}
}
- &-icon {
- width: 2em;
- }
-
&.oo-ui-widget-enabled {
input:focus,
textarea:focus {
@@ -447,6 +443,7 @@
.oo-ui-iconElement-icon {
width: @icon-size;
+ max-height: 2.375em;
margin-left: 0.3em;
}
}
@@ -459,6 +456,7 @@
.oo-ui-indicatorElement-indicator {
width: @indicator-size;
+ max-height: 2.375em;
margin-right: 0.775em;
}
}
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 6d95dae..c29c559 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -573,10 +573,6 @@
}
}
- &-icon {
- width: 2em;
- }
-
&.oo-ui-widget-enabled {
input,
textarea {
@@ -646,6 +642,7 @@
.oo-ui-iconElement-icon {
left: 0;
width: @icon-size;
+ max-height: 2.375em;
margin-left: 0.5em;
height: 100%;
background-position: right center;
@@ -660,6 +657,7 @@
.oo-ui-indicatorElement-indicator {
width: @indicator-size;
+ max-height: 2.375em;
margin: 0 0.775em;
height: 100%;
}
--
To view, visit https://gerrit.wikimedia.org/r/249381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1b3163b017f2f5daabe1fbad141b7e908401c21
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
