jenkins-bot has submitted this change and it was merged.
Change subject: Icon width should only be applied if there is an icon
......................................................................
Icon width should only be applied if there is an icon
Only apply icon styling (and in particular icon width/height)
if there is an actual icon set.
Change-Id: I5d3b38efa3995928447bc4dfc806b7f2f90ef2a0
---
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
2 files changed, 8 insertions(+), 12 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 04a979d..6713e62 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -377,22 +377,18 @@
.theme-oo-ui-decoratedOptionWidget () {
padding: 0.5em 2em 0.5em 3em;
- .oo-ui-iconElement-icon,
- .oo-ui-indicatorElement-indicator {
+ &.oo-ui-iconElement .oo-ui-iconElement-icon,
+ &.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
top: 0;
height: 100%;
}
- .oo-ui-indicatorElement-indicator {
- width: @indicator-size;
- }
-
- .oo-ui-iconElement-icon {
+ &.oo-ui-iconElement .oo-ui-iconElement-icon {
width: @icon-size;
left: 0.5em;
}
- .oo-ui-indicatorElement-indicator {
+ &.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
width: @indicator-size;
right: 0.5em;
}
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index b3e7c4f..8c6921b 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -527,18 +527,18 @@
.theme-oo-ui-decoratedOptionWidget () {
padding: 0.5em 2em 0.5em 3em;
- .oo-ui-iconElement-icon,
- .oo-ui-indicatorElement-indicator {
+ &.oo-ui-iconElement .oo-ui-iconElement-icon,
+ &.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
top: 0;
height: 100%;
}
- .oo-ui-iconElement-icon {
+ &.oo-ui-iconElement .oo-ui-iconElement-icon {
width: @icon-size;
left: 0.5em;
}
- .oo-ui-indicatorElement-indicator {
+ &.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
width: @indicator-size;
right: 0.5em;
}
--
To view, visit https://gerrit.wikimedia.org/r/195320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d3b38efa3995928447bc4dfc806b7f2f90ef2a0
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[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
