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
This commit is contained in:
Tim Nguyen 2019-09-27 19:03:27 +00:00
parent af55efcd96
commit 4dfb7c75f9
2 changed files with 82 additions and 90 deletions

View File

@ -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>

View File

@ -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;
}