Bug 1581514 - remove grid usage from EdReplace.xul. r=mkmelin
authorKhushil Mistry <khushil324@gmail.com>
Wed, 18 Sep 2019 05:50:00 +0200
changeset 78991 e569c75379ef9c533987f69001b14455979ffd96
parent 78990 f98a3da9570a53cf87f0a9102137fb52b7e05e34
child 78992 dd918656e4d7e4c79ebf44d9cb4e31eec406c1de
push id9333
push usermkmelin@iki.fi
push dateThu, 19 Sep 2019 05:20:01 +0000
treeherdertry-comm-central@406e11b425eb [default view] [failures only]
reviewersmkmelin
bugs1581514
Bug 1581514 - remove grid usage from EdReplace.xul. r=mkmelin
mail/components/compose/content/dialogs/EdReplace.xul
mail/themes/shared/mail/grid-layout.css
--- a/mail/components/compose/content/dialogs/EdReplace.xul
+++ b/mail/components/compose/content/dialogs/EdReplace.xul
@@ -1,16 +1,18 @@
 <?xml version="1.0"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
+<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/messengercompose/EditorReplace.dtd">
 
 <dialog id="replaceDlg" title="&replaceDialog.title;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
    persist="screenX screenY"
    buttons="cancel"
    onload="onLoad()">
@@ -19,42 +21,42 @@
   <script src="chrome://messenger/content/messengercompose/editorUtilities.js"/>
   <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
   <script src="chrome://messenger/content/messengercompose/EdReplace.js"/>
   <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
 
   <hbox>
     <vbox>
       <spacer class="spacer"/>
-      <grid align="start">
-        <columns><column/><column/></columns>
-        <rows>
-          <row align="center">
-            <label value="&findField.label;" accesskey="&findField.accesskey;" control="dialog.findInput"/>
-            <textbox id="dialog.findInput" oninput="doEnabling();"/>
-          </row>
-          <row align="center">
-            <label value="&replaceField.label;" accesskey="&replaceField.accesskey;" control="dialog.replaceInput"/>
-            <textbox id="dialog.replaceInput" oninput="doEnabling();"/>
-          </row>
-          <row align="start">
-            <spacer/>
-            <vbox align="start">
-              <spacer class="bigspacer"/>
-              <checkbox id="dialog.caseSensitive" label="&caseSensitiveCheckbox.label;"
-                  accesskey="&caseSensitiveCheckbox.accesskey;"/>
-              <checkbox id="dialog.wrap" label="&wrapCheckbox.label;"
-                  accesskey="&wrapCheckbox.accesskey;"/>
-              <checkbox id="dialog.searchBackwards" label="&backwardsCheckbox.label;"
-                  accesskey="&backwardsCheckbox.accesskey;"/>
-            </vbox>
-          </row>
-        </rows>
-      </grid>
+      <html:div class="grid-two-column">
+        <html:div class="flex-items-center">
+          <label value="&findField.label;" accesskey="&findField.accesskey;" control="dialog.findInput"/>
+        </html:div>
+        <html:div>
+          <html:input id="dialog.findInput" class="input-inline" oninput="doEnabling();"/>
+        </html:div>
+        <html:div class="flex-items-center">
+          <label value="&replaceField.label;" accesskey="&replaceField.accesskey;" control="dialog.replaceInput"/>
+        </html:div>
+        <html:div>
+          <html:input id="dialog.replaceInput" class="input-inline" oninput="doEnabling();"/>
+        </html:div>
+        <html:div class="grid-item-col2">
+          <vbox align="start">
+            <checkbox id="dialog.caseSensitive" label="&caseSensitiveCheckbox.label;"
+                      accesskey="&caseSensitiveCheckbox.accesskey;"/>
+            <checkbox id="dialog.wrap" label="&wrapCheckbox.label;"
+                      accesskey="&wrapCheckbox.accesskey;"/>
+            <checkbox id="dialog.searchBackwards" label="&backwardsCheckbox.label;"
+                      accesskey="&backwardsCheckbox.accesskey;"/>
+          </vbox>
+        </html:div>
+      </html:div>
     </vbox>
+    <spacer class="spacer"/>
     <vbox>
       <button id="findNext" label="&findNextButton.label;" accesskey="&findNextButton.accesskey;"
           oncommand="onFindNext();" default="true"/>
       <button id="replace" label="&replaceButton.label;" accesskey="&replaceButton.accesskey;"
           oncommand="onReplace();"/>
       <button id="replaceAndFind" label="&replaceAndFindButton.label;"
           accesskey="&replaceAndFindButton.accesskey;" oncommand="onReplace(); onFindNext();"/>
       <button id="replaceAll" label="&replaceAllButton.label;"
--- a/mail/themes/shared/mail/grid-layout.css
+++ b/mail/themes/shared/mail/grid-layout.css
@@ -28,8 +28,12 @@
 
 .flex-content-center {
   justify-content: center;
 }
 
 .grid-item-span-row {
   grid-column: 1 / -1;
 }
+
+.grid-item-col2 {
+  grid-column: 2 / 2;
+}