Bug 1581558 - remove grid usage from EdInsertTable.xul. r=mkmelin
authorKhushil Mistry <khushil324@gmail.com>
Tue, 17 Sep 2019 10:03:00 +0200
changeset 78990 f98a3da9570a53cf87f0a9102137fb52b7e05e34
parent 78989 2ecc70ddc9e184bfb0221f3ab7ca5be6abb57ee4
child 78991 e569c75379ef9c533987f69001b14455979ffd96
push id9333
push usermkmelin@iki.fi
push dateThu, 19 Sep 2019 05:20:01 +0000
treeherdertry-comm-central@406e11b425eb [default view] [failures only]
reviewersmkmelin
bugs1581558
Bug 1581558 - remove grid usage from EdInsertTable.xul. r=mkmelin
mail/components/compose/content/dialogs/EdInsertTable.xul
mail/themes/linux/editor/EditorDialog.css
mail/themes/osx/editor/EditorDialog.css
mail/themes/windows/editor/EditorDialog.css
--- a/mail/components/compose/content/dialogs/EdInsertTable.xul
+++ b/mail/components/compose/content/dialogs/EdInsertTable.xul
@@ -23,56 +23,60 @@
   <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js"/>
   <script src="chrome://messenger/content/messengercompose/EdInsertTable.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <groupbox>
     <hbox class="groupbox-title">
       <label class="header">&size.label;</label>
     </hbox>
-    <grid>
-      <columns>
-        <column flex="1"/>
-        <column flex="1"/>
-        <column flex="6"/>
-      </columns>
-      <rows>
-        <row align="center">
-          <label control="rowsInput" class="align-right"
+    <html:table>
+      <html:tr>
+        <html:th>
+          <label control="rowsInput"
                  value="&numRowsEditField.label;"
                  accesskey="&numRowsEditField.accessKey;"/>
-          <textbox class="narrow" id="rowsInput" oninput="ChangeRowOrColumn(this.id)" />
-          <spacer/>
-        </row>
-        <row align="center">
-          <label control="columnsInput" class="align-right"
+        </html:th>
+        <html:td>
+          <html:input id="rowsInput" type="number" class="narrow" oninput="ChangeRowOrColumn(this.id)"/>
+        </html:td>
+      </html:tr>
+      <html:tr>
+        <html:th>
+          <label control="columnsInput"
                  value="&numColumnsEditField.label;"
                  accesskey="&numColumnsEditField.accessKey;"/>
-          <textbox class="narrow" id="columnsInput" oninput="ChangeRowOrColumn(this.id)" />
-          <spacer/>
-        </row>
-        <row align="center">
-          <label control="widthInput" class="align-right"
+        </html:th>
+        <html:td>
+          <html:input id="columnsInput" type="number" class="narrow" oninput="ChangeRowOrColumn(this.id)"/>
+        </html:td>
+      </html:tr>
+      <html:tr>
+        <html:th>
+          <label control="widthInput"
                  value="&widthEditField.label;"
                  accesskey="&widthEditField.accessKey;"/>
-          <textbox class="narrow" id="widthInput" oninput="forceInteger(this.id)" />
-          <menulist id="widthPixelOrPercentMenulist" flex="1"/>
-            <!-- child elements are appended by JS -->
-        </row>
-      </rows>
-    </grid>
+        </html:th>
+        <html:td>
+          <html:input id="widthInput" type="number" class="narrow" oninput="forceInteger(this.id)"/>
+        </html:td>
+        <html:td>
+          <menulist id="widthPixelOrPercentMenulist" class="menulist-narrow"/>
+        </html:td>
+      </html:tr>
+    </html:table>
     <spacer class="spacer"/>
   </groupbox>
   <spacer class="spacer"/>
   <hbox align="center">
-    <label control="borderInput" class="align-right"
-        value="&borderEditField.label;"
-        accesskey="&borderEditField.accessKey;"
-        tooltiptext="&borderEditField.tooltip;" />
-    <textbox class="narrow" id="borderInput" oninput="forceInteger(this.id)" />
+    <label control="borderInput"
+           value="&borderEditField.label;"
+           accesskey="&borderEditField.accessKey;"
+           tooltiptext="&borderEditField.tooltip;" />
+    <html:input id="borderInput" type="number" class="narrow" oninput="forceInteger(this.id)" />
     <label value="&pixels.label;"/>
   </hbox>
   <vbox id="AdvancedEdit">
     <hbox flex="1" style="margin-top: 0.2em" align="center">
       <!-- This will right-align the button -->
       <spacer flex="1"/>
       <button id="AdvancedEditButton1" oncommand="onAdvancedEdit()" label="&AdvancedEditButton.label;"
               accesskey="&AdvancedEditButton.accessKey;" tooltiptext="&AdvancedEditButton.tooltip;"/>
--- a/mail/themes/linux/editor/EditorDialog.css
+++ b/mail/themes/linux/editor/EditorDialog.css
@@ -1,13 +1,13 @@
 /* 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/. */
 
-@namespace url("http://www.w3.org/1999/xhtml");
+@namespace html url("http://www.w3.org/1999/xhtml");
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* The defaults are WAY to big! */
 groupbox {
   margin:         2px 5px;
   padding-top:    2px;
   padding-bottom: 4px;
 }
@@ -35,20 +35,24 @@ groupbox {
 .italic {
   font-style: italic;
 }
 
 .larger {
   font-size: 120%;
 }
 
-.narrow {
+*|*.narrow {
   width: 3em;
 }
 
+.menulist-narrow {
+  width: 10em;
+}
+
 .wrap {
  width: 1em;
 }
 
 .menuitem-highlight-1 {
   font-weight : bold;
 }
 
@@ -297,8 +301,13 @@ tree.list {
 
 /* ::::: groupbox ::::: */
 
 groupbox {
   -moz-appearance: groupbox;
   margin: 5px;
   padding: 5px;
 }
+
+html|table html|th {
+  font-weight: normal;
+  text-align: start;
+}
--- a/mail/themes/osx/editor/EditorDialog.css
+++ b/mail/themes/osx/editor/EditorDialog.css
@@ -1,13 +1,13 @@
 /* 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/. */
 
-@namespace url("http://www.w3.org/1999/xhtml");
+@namespace html url("http://www.w3.org/1999/xhtml");
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* The defaults are WAY to big! */
 groupbox {
   margin:         2px 5px ;
   padding-top:    2px;
   padding-bottom: 4px;
 }
@@ -35,20 +35,24 @@ groupbox {
 .italic {
   font-style: italic;
 }
 
 .larger {
   font-size: 120%;
 }
 
-.narrow {
+*|*.narrow {
   width: 3em;
 }
 
+.menulist-narrow {
+  width: 10em;
+}
+
 .wrap {
  width: 1em;
 }
 
 .menuitem-highlight-1 {
   font-weight : bold;
 }
 
@@ -305,8 +309,13 @@ groupbox {
 
 groupbox > .groupbox-title > .header {
   font-size: 1.18em;
   font-weight: normal;
   margin-top: -1.3em;
   margin-bottom: 5px;
   margin-inline-start: -5px;
 }
+
+html|table html|th {
+  font-weight: normal;
+  text-align: start;
+}
--- a/mail/themes/windows/editor/EditorDialog.css
+++ b/mail/themes/windows/editor/EditorDialog.css
@@ -1,13 +1,13 @@
 /* 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/. */
 
-@namespace url("http://www.w3.org/1999/xhtml");
+@namespace html url("http://www.w3.org/1999/xhtml");
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* The defaults are WAY to big! */
 groupbox {
   margin: 1em 5px 2px;
   padding-top: 2px;
   padding-bottom: 4px;
 }
@@ -42,20 +42,24 @@ groupbox > hbox > .header {
 .italic {
   font-style: italic;
 }
 
 .larger {
   font-size: 120%;
 }
 
-.narrow {
+*|*.narrow {
   width: 3em;
 }
 
+.menulist-narrow {
+  width: 10em;
+}
+
 .wrap {
  width: 1em;
 }
 
 .menuitem-highlight-1 {
   font-weight : bold;
 }
 
@@ -329,8 +333,13 @@ groupbox {
 groupbox > .groupbox-title > .header {
   font-weight: normal;
   margin-top: -1em;
   margin-inline-start: 3px;
   padding-right: 3px;
   padding-left: 3px;
   background-color: -moz-dialog;
 }
+
+html|table html|th {
+  font-weight: normal;
+  text-align: start;
+}