From a4dac831d9a641b1d189e0a3e751b9dbe2b0ae85 Mon Sep 17 00:00:00 2001 From: Thiemo Kreuz Date: Mon, 30 Aug 2021 17:38:36 +0200 Subject: [PATCH] Try to use margin/padding instead of flex for template dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Proof of concept: while flex is – well – flexible, it feels like this should be possible with some good old block containers and margins. It's pixel-perfect in my test. Bug: T288465 Change-Id: I1458900fff197e08ce318398524a3cf2b6b9ee2a --- .../dialogs/ve.ui.MWTransclusionDialog.css | 4 ---- .../pages/ve.ui.MWTemplatePage-default.css | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css index 92e604380e..84773f901e 100644 --- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css +++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css @@ -228,7 +228,3 @@ color: #72777d; margin: 8px 24px; } - -.ve-ui-mwTransclusionDialog-multipart-message { - margin: 20px; -} diff --git a/modules/ve-mw/ui/styles/pages/ve.ui.MWTemplatePage-default.css b/modules/ve-mw/ui/styles/pages/ve.ui.MWTemplatePage-default.css index 5f073b28be..80432e3f01 100644 --- a/modules/ve-mw/ui/styles/pages/ve.ui.MWTemplatePage-default.css +++ b/modules/ve-mw/ui/styles/pages/ve.ui.MWTemplatePage-default.css @@ -23,3 +23,20 @@ .ve-ui-mwTemplatePage-description-missing { font-style: italic; } + +.ve-ui-mwTransclusionDialog-newSidebar .oo-ui-menuLayout-content > .oo-ui-bookletLayout-stackLayout { + /* Wo don't want anything to collapse left/right, so shouldn't use margin */ + padding: 0 48px; +} + +.ve-ui-mwTransclusionDialog-newSidebar .oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout, +.ve-ui-mwTransclusionDialog-newSidebar .ve-ui-mwTransclusionDialog-multipart-message { + /* This top/bottom margin is meant to collapse with the next one */ + margin: 48px 0; +} + +.ve-ui-mwTransclusionDialog-newSidebar .oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout, +.ve-ui-mwTransclusionDialog-newSidebar .ve-ui-mwParameterPage-info, +.ve-ui-mwTransclusionDialog-newSidebar .ve-ui-mwParameterPage-field { + padding: 0; +}