jenkins-bot has submitted this change and it was merged.

Change subject: FieldsetLayout: Styling fixes for `<legend>` labels
......................................................................


FieldsetLayout: Styling fixes for `<legend>` labels

* Make the `<legend>` 'display: inline-table' rather than 'table'.
  A block-level table would push down elements that follow it,
  including the "help" icon, which in turn messed up the fields.
  Fixes T145682, T145678 and first half of T145680.
* Only style .oo-ui-labelElement-label with margin and padding
  if we have the .oo-ui-labelElement class (label is not empty).
  Fixes second half of T145680.

Follow-up to 9cf8b941a9c618f1d7ba2512508f576f70116e1e.

Bug: T145682
Bug: T145678
Bug: T145680
Change-Id: Id95f4167afa6c000d6d2fa2ad7a62b65b6d4d53b
---
M src/styles/layouts/FieldsetLayout.less
M src/themes/apex/layouts.less
M src/themes/mediawiki/layouts.less
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/styles/layouts/FieldsetLayout.less 
b/src/styles/layouts/FieldsetLayout.less
index f4753c4..07d366b 100644
--- a/src/styles/layouts/FieldsetLayout.less
+++ b/src/styles/layouts/FieldsetLayout.less
@@ -18,7 +18,7 @@
 
        &.oo-ui-labelElement > .oo-ui-labelElement-label {
                color: inherit; // Correct the color inheritance from 
`fieldset` elements in IE
-               display: table; // Correct the text wrapping in Edge and IE
+               display: inline-table; // Correct the text wrapping in Edge and 
IE
                box-sizing: border-box; // Correct the text wrapping in Edge 
and IE
                max-width: 100%; // Correct the text wrapping in Edge and IE
                padding: 0;
diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less
index e2902f8..b0f8989 100644
--- a/src/themes/apex/layouts.less
+++ b/src/themes/apex/layouts.less
@@ -108,7 +108,7 @@
                margin-top: 2em;
        }
 
-       > .oo-ui-labelElement-label {
+       &.oo-ui-labelElement > .oo-ui-labelElement-label {
                font-size: 1.1em;
                margin-bottom: 0.5em;
                padding: 0.25em 0;
diff --git a/src/themes/mediawiki/layouts.less 
b/src/themes/mediawiki/layouts.less
index 17c1945..8767ed6 100644
--- a/src/themes/mediawiki/layouts.less
+++ b/src/themes/mediawiki/layouts.less
@@ -113,7 +113,7 @@
                margin-top: 2em;
        }
 
-       > .oo-ui-labelElement-label {
+       &.oo-ui-labelElement > .oo-ui-labelElement-label {
                margin-bottom: 0.5em;
                font-size: 1.1em;
                font-weight: bold;

-- 
To view, visit https://gerrit.wikimedia.org/r/310800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id95f4167afa6c000d6d2fa2ad7a62b65b6d4d53b
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz DziewoƄski <matma....@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: VolkerE <volke...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to