From 4dfb7c75f93a8bbf494569dfd6fc74876abfb21a Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Fri, 27 Sep 2019 19:03:27 +0000
Subject: [PATCH] Bug 1521298 - Remove XUL grid layout from
 toolkit/components/printing/content/printPageSetup.xul. r=mconley

Differential Revision: https://phabricator.services.mozilla.com/D47023

--HG--
extra : moz-landing-system : lando
---
 .../printing/content/printPageSetup.xul       | 167 ++++++++----------
 .../themes/windows/global/printPageSetup.css  |   5 +
 2 files changed, 82 insertions(+), 90 deletions(-)

diff --git a/toolkit/components/printing/content/printPageSetup.xul b/toolkit/components/printing/content/printPageSetup.xul
index 9c249dcb9e8e..e5257e0f7def 100644
--- a/toolkit/components/printing/content/printPageSetup.xul
+++ b/toolkit/components/printing/content/printPageSetup.xul
@@ -127,96 +127,83 @@
         </groupbox>
         <groupbox>
           <caption><label data-l10n-id="header-footer-label"/></caption>
-          <grid class="groupbox-body">
-            <columns>
-              <column/>
-              <column/>
-              <column/>
-            </columns>
-            <rows>
-              <row dir="ltr">
-                <menulist id="hLeftOption" oncommand="customize(this)" data-l10n-id="header-left-tip">
-                  <menupopup>
-                    <menuitem value="0" data-l10n-id="hf-blank"/>
-                    <menuitem value="1" data-l10n-id="hf-title"/>
-                    <menuitem value="2" data-l10n-id="hf-url"/>
-                    <menuitem value="3" data-l10n-id="hf-date-and-time"/>
-                    <menuitem value="4" data-l10n-id="hf-page"/>
-                    <menuitem value="5" data-l10n-id="hf-page-and-total"/>
-                    <menuitem value="6" data-l10n-id="hf-custom"/>
-                  </menupopup>
-                </menulist>
-                <menulist id="hCenterOption" oncommand="customize(this)" data-l10n-id="header-center-tip">
-                  <menupopup>
-                    <menuitem value="0" data-l10n-id="hf-blank"/>
-                    <menuitem value="1" data-l10n-id="hf-title"/>
-                    <menuitem value="2" data-l10n-id="hf-url"/>
-                    <menuitem value="3" data-l10n-id="hf-date-and-time"/>
-                    <menuitem value="4" data-l10n-id="hf-page"/>
-                    <menuitem value="5" data-l10n-id="hf-page-and-total"/>
-                    <menuitem value="6" data-l10n-id="hf-custom"/>
-                  </menupopup>
-                </menulist>
-                <menulist id="hRightOption" oncommand="customize(this)" data-l10n-id="header-right-tip">
-                  <menupopup>
-                    <menuitem value="0" data-l10n-id="hf-blank"/>
-                    <menuitem value="1" data-l10n-id="hf-title"/>
-                    <menuitem value="2" data-l10n-id="hf-url"/>
-                    <menuitem value="3" data-l10n-id="hf-date-and-time"/>
-                    <menuitem value="4" data-l10n-id="hf-page"/>
-                    <menuitem value="5" data-l10n-id="hf-page-and-total"/>
-                    <menuitem value="6" data-l10n-id="hf-custom"/>
-                  </menupopup>
-                </menulist>
-              </row>
-              <row dir="ltr">
-                <vbox align="center">
-                  <label data-l10n-id="hf-left-label"/>
-                </vbox>
-                <vbox align="center">
-                  <label data-l10n-id="hf-center-label"/>
-                </vbox>
-                <vbox align="center">
-                  <label data-l10n-id="hf-right-label"/>
-                </vbox>
-              </row>
-              <row dir="ltr">
-                <menulist id="fLeftOption" oncommand="customize(this)" data-l10n-id="footer-left-tip">
-                  <menupopup>
-                    <menuitem value="0" data-l10n-id="hf-blank"/>
-                    <menuitem value="1" data-l10n-id="hf-title"/>
-                    <menuitem value="2" data-l10n-id="hf-url"/>
-                    <menuitem value="3" data-l10n-id="hf-date-and-time"/>
-                    <menuitem value="4" data-l10n-id="hf-page"/>
-                    <menuitem value="5" data-l10n-id="hf-page-and-total"/>
-                    <menuitem value="6" data-l10n-id="hf-custom"/>
-                  </menupopup>
-                </menulist>
-                <menulist id="fCenterOption" oncommand="customize(this)" data-l10n-id="footer-center-tip">
-                  <menupopup>
-                    <menuitem value="0" data-l10n-id="hf-blank"/>
-                    <menuitem value="1" data-l10n-id="hf-title"/>
-                    <menuitem value="2" data-l10n-id="hf-url"/>
-                    <menuitem value="3" data-l10n-id="hf-date-and-time"/>
-                    <menuitem value="4" data-l10n-id="hf-page"/>
-                    <menuitem value="5" data-l10n-id="hf-page-and-total"/>
-                    <menuitem value="6" data-l10n-id="hf-custom"/>
-                  </menupopup>
-                </menulist>
-                <menulist id="fRightOption" oncommand="customize(this)" data-l10n-id="footer-right-tip">
-                  <menupopup>
-                    <menuitem value="0" data-l10n-id="hf-blank"/>
-                    <menuitem value="1" data-l10n-id="hf-title"/>
-                    <menuitem value="2" data-l10n-id="hf-url"/>
-                    <menuitem value="3" data-l10n-id="hf-date-and-time"/>
-                    <menuitem value="4" data-l10n-id="hf-page"/>
-                    <menuitem value="5" data-l10n-id="hf-page-and-total"/>
-                    <menuitem value="6" data-l10n-id="hf-custom"/>
-                  </menupopup>
-                </menulist>
-              </row>
-            </rows>
-          </grid>
+          <box id="header-footer-grid" class="groupbox-body" dir="ltr">
+            <menulist id="hLeftOption" oncommand="customize(this)" data-l10n-id="header-left-tip">
+              <menupopup>
+                <menuitem value="0" data-l10n-id="hf-blank"/>
+                <menuitem value="1" data-l10n-id="hf-title"/>
+                <menuitem value="2" data-l10n-id="hf-url"/>
+                <menuitem value="3" data-l10n-id="hf-date-and-time"/>
+                <menuitem value="4" data-l10n-id="hf-page"/>
+                <menuitem value="5" data-l10n-id="hf-page-and-total"/>
+                <menuitem value="6" data-l10n-id="hf-custom"/>
+              </menupopup>
+            </menulist>
+            <menulist id="hCenterOption" oncommand="customize(this)" data-l10n-id="header-center-tip">
+              <menupopup>
+                <menuitem value="0" data-l10n-id="hf-blank"/>
+                <menuitem value="1" data-l10n-id="hf-title"/>
+                <menuitem value="2" data-l10n-id="hf-url"/>
+                <menuitem value="3" data-l10n-id="hf-date-and-time"/>
+                <menuitem value="4" data-l10n-id="hf-page"/>
+                <menuitem value="5" data-l10n-id="hf-page-and-total"/>
+                <menuitem value="6" data-l10n-id="hf-custom"/>
+              </menupopup>
+            </menulist>
+            <menulist id="hRightOption" oncommand="customize(this)" data-l10n-id="header-right-tip">
+              <menupopup>
+                <menuitem value="0" data-l10n-id="hf-blank"/>
+                <menuitem value="1" data-l10n-id="hf-title"/>
+                <menuitem value="2" data-l10n-id="hf-url"/>
+                <menuitem value="3" data-l10n-id="hf-date-and-time"/>
+                <menuitem value="4" data-l10n-id="hf-page"/>
+                <menuitem value="5" data-l10n-id="hf-page-and-total"/>
+                <menuitem value="6" data-l10n-id="hf-custom"/>
+              </menupopup>
+            </menulist>
+            <vbox align="center">
+              <label data-l10n-id="hf-left-label"/>
+            </vbox>
+            <vbox align="center">
+              <label data-l10n-id="hf-center-label"/>
+            </vbox>
+            <vbox align="center">
+              <label data-l10n-id="hf-right-label"/>
+            </vbox>
+            <menulist id="fLeftOption" oncommand="customize(this)" data-l10n-id="footer-left-tip">
+              <menupopup>
+                <menuitem value="0" data-l10n-id="hf-blank"/>
+                <menuitem value="1" data-l10n-id="hf-title"/>
+                <menuitem value="2" data-l10n-id="hf-url"/>
+                <menuitem value="3" data-l10n-id="hf-date-and-time"/>
+                <menuitem value="4" data-l10n-id="hf-page"/>
+                <menuitem value="5" data-l10n-id="hf-page-and-total"/>
+                <menuitem value="6" data-l10n-id="hf-custom"/>
+              </menupopup>
+            </menulist>
+            <menulist id="fCenterOption" oncommand="customize(this)" data-l10n-id="footer-center-tip">
+              <menupopup>
+                <menuitem value="0" data-l10n-id="hf-blank"/>
+                <menuitem value="1" data-l10n-id="hf-title"/>
+                <menuitem value="2" data-l10n-id="hf-url"/>
+                <menuitem value="3" data-l10n-id="hf-date-and-time"/>
+                <menuitem value="4" data-l10n-id="hf-page"/>
+                <menuitem value="5" data-l10n-id="hf-page-and-total"/>
+                <menuitem value="6" data-l10n-id="hf-custom"/>
+              </menupopup>
+            </menulist>
+            <menulist id="fRightOption" oncommand="customize(this)" data-l10n-id="footer-right-tip">
+              <menupopup>
+                <menuitem value="0" data-l10n-id="hf-blank"/>
+                <menuitem value="1" data-l10n-id="hf-title"/>
+                <menuitem value="2" data-l10n-id="hf-url"/>
+                <menuitem value="3" data-l10n-id="hf-date-and-time"/>
+                <menuitem value="4" data-l10n-id="hf-page"/>
+                <menuitem value="5" data-l10n-id="hf-page-and-total"/>
+                <menuitem value="6" data-l10n-id="hf-custom"/>
+              </menupopup>
+            </menulist>
+          </box>
         </groupbox>
       </vbox>
     </tabpanels>
diff --git a/toolkit/themes/windows/global/printPageSetup.css b/toolkit/themes/windows/global/printPageSetup.css
index ac0d205befbd..347546e2439a 100644
--- a/toolkit/themes/windows/global/printPageSetup.css
+++ b/toolkit/themes/windows/global/printPageSetup.css
@@ -30,3 +30,8 @@ caption > label {
 .landscape-page {
   list-style-image: url("chrome://global/skin/icons/Landscape.png");
 }
+
+#header-footer-grid {
+  display: grid;
+  grid-template-columns: auto auto auto;
+}