jenkins-bot has submitted this change and it was merged. Change subject: FieldLayout: In styles, don't assume that label is given ......................................................................
FieldLayout: In styles, don't assume that label is given Caused ugly spaces in VE's interface where we abuse FieldLayouts. https://phabricator.wikimedia.org/F21023 Change-Id: Iede750cba53b94615b54ed633ea5eca23cb3a633 --- M src/styles/layouts/FieldLayout.less M src/themes/apex/layouts.less M src/themes/mediawiki/layouts.less 3 files changed, 13 insertions(+), 9 deletions(-) Approvals: Trevor Parscal: Looks good to me, approved jenkins-bot: Verified diff --git a/src/styles/layouts/FieldLayout.less b/src/styles/layouts/FieldLayout.less index d81d3ea..799f9f4 100644 --- a/src/styles/layouts/FieldLayout.less +++ b/src/styles/layouts/FieldLayout.less @@ -38,7 +38,7 @@ } } - &.oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { + &.oo-ui-labelElement.oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { display: inline-block; } diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less index 6b610c8..be71716 100644 --- a/src/themes/apex/layouts.less +++ b/src/themes/apex/layouts.less @@ -27,7 +27,7 @@ &.oo-ui-fieldLayout-align-left, &.oo-ui-fieldLayout-align-right { - > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { + &.oo-ui-labelElement > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { padding-top: 0.5em; margin-right: 5%; width: 35%; @@ -39,7 +39,7 @@ } &.oo-ui-fieldLayout-align-inline { - > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { + &.oo-ui-labelElement > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { padding: 0.5em; } @@ -48,8 +48,10 @@ } } - &.oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { - padding: 0.5em 0; + &.oo-ui-fieldLayout-align-top { + &.oo-ui-labelElement > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { + padding: 0.5em 0; + } } > .oo-ui-popupButtonWidget { diff --git a/src/themes/mediawiki/layouts.less b/src/themes/mediawiki/layouts.less index 02eb697..9115f16 100644 --- a/src/themes/mediawiki/layouts.less +++ b/src/themes/mediawiki/layouts.less @@ -27,7 +27,7 @@ &.oo-ui-fieldLayout-align-left, &.oo-ui-fieldLayout-align-right { - > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { + &.oo-ui-labelElement > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { padding-top: 0.5em; margin-right: 5%; width: 35%; @@ -39,7 +39,7 @@ } &.oo-ui-fieldLayout-align-inline { - > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { + &.oo-ui-labelElement > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { padding: 0.5em; } @@ -48,8 +48,10 @@ } } - &.oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { - padding: 0.5em 0; + &.oo-ui-fieldLayout-align-top { + &.oo-ui-labelElement > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { + padding: 0.5em 0; + } } > .oo-ui-popupButtonWidget { -- To view, visit https://gerrit.wikimedia.org/r/179514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iede750cba53b94615b54ed633ea5eca23cb3a633 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com> Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
