jenkins-bot has submitted this change and it was merged.
Change subject: TextInputWidget: Fix appearance of icons and labels when
disabled
......................................................................
TextInputWidget: Fix appearance of icons and labels when disabled
Change-Id: I3618e4674128e825686ed2d0ecb951ac0c5790b7
---
M demos/pages/widgets.js
M src/styles/widgets/TextInputWidget.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
4 files changed, 36 insertions(+), 11 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 57f553a..933098b 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -759,16 +759,6 @@
),
new OO.ui.FieldLayout(
new OO.ui.TextInputWidget( {
- value: 'Disabled',
- disabled: true
- } ),
- {
- label: 'TextInputWidget
(disabled)\u200E',
- align: 'top'
- }
- ),
- new OO.ui.FieldLayout(
- new OO.ui.TextInputWidget( {
multiline: true,
value: 'Multiline\nMultiline'
} ),
@@ -801,6 +791,19 @@
}
),
new OO.ui.FieldLayout(
+ new OO.ui.TextInputWidget( {
+ value: 'Disabled',
+ icon: 'picture',
+ indicator: 'required',
+ label: 'Inline label',
+ disabled: true
+ } ),
+ {
+ label: 'TextInputWidget (icon,
indicator, label, disabled)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
new OO.ui.DropdownWidget( {
label: 'Select one',
menu: {
diff --git a/src/styles/widgets/TextInputWidget.less
b/src/styles/widgets/TextInputWidget.less
index 5937008..dd0cdf4 100644
--- a/src/styles/widgets/TextInputWidget.less
+++ b/src/styles/widgets/TextInputWidget.less
@@ -27,11 +27,17 @@
top: 0;
height: 100%;
background-repeat: no-repeat;
- cursor: pointer;
.oo-ui-unselectable();
}
+ &.oo-ui-widget-enabled {
+ > .oo-ui-iconElement-icon,
+ > .oo-ui-indicatorElement-indicator {
+ cursor: pointer;
+ }
+ }
+
&.oo-ui-labelElement > .oo-ui-labelElement-label {
display: block;
}
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 016641b..e6fed28 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -249,6 +249,14 @@
border-color: #ddd;
background-color: #f3f3f3;
}
+ .oo-ui-iconElement-icon,
+ .oo-ui-indicatorElement-indicator {
+ opacity: 0.2;
+ }
+ .oo-ui-labelElement-label {
+ color: #ddd;
+ text-shadow: 0 1px 1px #fff;
+ }
}
&.oo-ui-pendingElement-pending {
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 8dec530..6fd3487 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -419,6 +419,14 @@
border-color: #ddd;
background-color: #f3f3f3;
}
+ .oo-ui-iconElement-icon,
+ .oo-ui-indicatorElement-indicator {
+ opacity: 0.2;
+ }
+ .oo-ui-labelElement-label {
+ color: #ddd;
+ text-shadow: 0 1px 1px #fff;
+ }
}
&.oo-ui-pendingElement-pending {
--
To view, visit https://gerrit.wikimedia.org/r/190473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3618e4674128e825686ed2d0ecb951ac0c5790b7
Gerrit-PatchSet: 5
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
