Bug 1784408 - Port bug 1784265: Drop support for flex attribute values other than 0 and 1. r=mkmelin

Differential Revision: https://phabricator.services.mozilla.com/D154507 --HG-- extra : amend_source : 583afa3a0897ea33aa8b412e668d8fd1217f4412 extra : absorb_source : b7a744136b24901688452dd74b7fc4c81602cf6f
2022-08-13 20:22:59 +10:00 · 2022-08-13 20:22:59 +10:00 · e03ba5df0c
--- a/chat/content/otr-finger.xhtml
+++ b/chat/content/otr-finger.xhtml
@ -26,11 +26,11 @@
            style="height: 20em;"
            onselect="otrFinger.select()">
        <treecols>
-          <treecol id="screenname" data-l10n-id="finger-screen-name" flex="20" />
+          <treecol id="screenname" data-l10n-id="finger-screen-name" style="-moz-box-flex: 20;" />
          <splitter class="tree-splitter"/>
-          <treecol id="fingerprint" data-l10n-id="finger-fingerprint" flex="120" />
+          <treecol id="fingerprint" data-l10n-id="finger-fingerprint" style="-moz-box-flex: 120;" />
          <splitter class="tree-splitter"/>
-          <treecol id="verified" data-l10n-id="finger-verified" flex="10" />
+          <treecol id="verified" data-l10n-id="finger-verified" style="-moz-box-flex: 10;" />
          <splitter class="tree-splitter"/>
        </treecols>
        <treechildren/>
--- a/mail/base/content/SearchDialog.xhtml
+++ b/mail/base/content/SearchDialog.xhtml
@ -86,18 +86,18 @@
 #endif
  </keyset>

-    <vbox id="searchTerms" class="themeable-brighttext" flex="3" persist="height">
+    <vbox id="searchTerms" class="themeable-brighttext" persist="height">
      <vbox>
        <hbox align="center">
          <label value="&searchHeading.label;" accesskey="&searchHeading.accesskey;"
                 control="searchableFolders"/>
-          <menulist id="searchableFolders" flex="2" class="folderMenuItem"
+          <menulist id="searchableFolders" class="folderMenuItem"
                    displayformat="verbose">
            <menupopup is="folder-menupopup" class="menulist-menupopup"
                       mode="search" showAccountsFileHere="true" showFileHereLabel="true"
                       oncommand="updateSearchFolderPicker(event.target._folder);"/>
          </menulist>
-          <spacer flex="10"/>
+          <spacer style="-moz-box-flex: 10;"/>
          <button id="search-button" oncommand="onSearchButton(event);" default="true"/>
        </hbox>

@ -107,7 +107,7 @@
                    accesskey="&searchSubfolders.accesskey;"
                    checked="true"
                    persist="checked"/>
-          <spacer flex="10"/>
+          <spacer style="-moz-box-flex: 10;"/>
          <button label="&resetButton.label;" oncommand="onResetSearch(event);" accesskey="&resetButton.accesskey;"/>
        </hbox>
        <hbox align="center">
@ -127,7 +127,7 @@

    <splitter id="gray_horizontal_splitter" persist="state" orient="vertical"/>

-    <vbox id="searchResults" flex="4" persist="height">
+    <vbox id="searchResults" persist="height">
      <vbox id="searchResultListBox" flex="1">
 #include threadTree.inc.xhtml
      </vbox>
--- a/mail/base/content/aboutMessage.xhtml
+++ b/mail/base/content/aboutMessage.xhtml
@ -85,7 +85,7 @@
    <!-- msg header view -->
    <!-- a convenience box for ease of extension overlaying -->
    <hbox id="messagepaneboxwrapper" flex="1">
-      <vbox id="messagepanebox" flex="3"
+      <vbox id="messagepanebox"
            ondragover="messagepaneObserver.onDragOver(event);"
            ondrop="messagepaneObserver.onDrop(event);"
            ondragleave="messagepaneObserver.onDragLeave(event);">
--- a/mail/base/content/mainMailToolbar.inc.xhtml
+++ b/mail/base/content/mainMailToolbar.inc.xhtml
@ -318,7 +318,7 @@
                   observes="button_compact"/>
    <toolbaritem id="folder-location-container" insert-after="button-stop"
                 title="&folderLocationToolbarItem.title;"
-                 align="center" flex="2"
+                 align="center"
                 class="chromeclass-toolbar-additional">
      <menulist id="locationFolders"
                flex="1"
--- a/mail/base/content/messageWindow.xhtml
+++ b/mail/base/content/messageWindow.xhtml
@ -261,7 +261,7 @@
    <!-- msg header view -->
    <!-- a convenience box for ease of extension overlaying -->
    <hbox id="messagepaneboxwrapper" flex="1">
-      <vbox id="messagepanebox" flex="3"
+      <vbox id="messagepanebox"
            ondragover="messagepaneObserver.onDragOver(event);"
            ondrop="messagepaneObserver.onDrop(event);"
            ondragleave="messagepaneObserver.onDragLeave(event);">
--- a/mail/base/content/messenger-menubar.inc.xhtml
+++ b/mail/base/content/messenger-menubar.inc.xhtml
@ -1160,6 +1160,4 @@

      <!-- Help -->
 #include helpMenu.inc.xhtml
-
-  <spacer id="menubar_spacer" flex="100%"/>
 </menubar>
--- a/mail/base/content/messenger.xhtml
+++ b/mail/base/content/messenger.xhtml
@ -529,7 +529,7 @@
                          clicktoscroll="true"
                          style="min-width: 1px;">
            <tab is="tabmail-tab" selected="true" validate="never"
-                 style="min-width:100px; max-width:250px;" width="0" flex="100"
+                 style="min-width:100px; max-width:250px; " width="0"
                 class="tabmail-tab" crop="end"/>
          </arrowscrollbox>
        </tabs>
@ -648,7 +648,6 @@
                  <treecol id="folderNameCol"
                           closemenu="none"
                           label2="&folderNameColumn.label;"
-                           flex="5"
                           crop="center"
                           persist="width"
                           hideheader="true"
@ -730,7 +729,7 @@
                      flex="1"
                      style="min-height:100px; min-width:100px;"
                      height="200" width="200">
-                  <vbox id="messagepanebox" flex="2">
+                  <vbox id="messagepanebox">
                    <!-- This next iframe is used to display summaries of -->
                    <!-- multiple selected messages or collapsed threads -->
                    <browser id="multimessage"
--- a/mail/base/content/msgAttachmentView.inc.xhtml
+++ b/mail/base/content/msgAttachmentView.inc.xhtml
@ -27,7 +27,7 @@
                            <!-- Use a very large flex value here so that attachmentCount doesn't take
                                 up more space than necessary, but still crops itself if there's not
                                 enough space. -->
-                            <spacer flex="9999"/>
+                            <spacer style="-moz-box-flex: 9999;"/>

                            <vbox id="attachment-view-toolbox" class="inline-toolbox">
                              <hbox id="attachment-view-toolbar"
--- a/mail/base/content/printUtils.js
+++ b/mail/base/content/printUtils.js
@ -76,12 +76,10 @@ XPCOMUtils.defineLazyGetter(this, "PrintUtils", () => {
    let stack = document.createXULElement("stack");
    stack.className = "browserStack";
    stack.appendChild(b);
-    stack.setAttribute("flex", "10000");

    let browserContainer = document.createXULElement("vbox");
    browserContainer.className = "browserContainer";
    browserContainer.appendChild(stack);
-    browserContainer.setAttribute("flex", "10000");

    let browserSidebarContainer = document.createXULElement("hbox");
    browserSidebarContainer.className = "browserSidebarContainer";
--- a/mail/base/content/quickFilterBar.inc.xhtml
+++ b/mail/base/content/quickFilterBar.inc.xhtml
@ -54,7 +54,6 @@
               noresultsstring="&quickFilterBar.resultsLabel.none;"
               />
        <search-textbox id="qfb-qs-textbox"
-                        flex="3"
                        class="themeableSearchBox"
                        placeholder=""
                        emptytextbase="&quickFilterBar.textbox.emptyText.base1;"
@ -68,8 +67,7 @@
      <hbox id="quick-filter-bar-expando">
        <arrowscrollbox id="quick-filter-bar-tab-bar"
                        orient="horizontal"
-                        collapsed="true"
-                        flex="2">
+                        collapsed="true">
        <menulist id="qfb-boolean-mode"
                  tooltiptext="&quickFilterBar.booleanMode.tooltip;"
                  persist="value">
--- a/mail/base/content/tabmail.js
+++ b/mail/base/content/tabmail.js
@ -883,7 +883,6 @@ var { UIFontSize } = ChromeUtils.import("resource:///modules/UIFontSize.jsm");
          t.maxWidth = this.tabContainer.mTabMaxWidth;
          t.minWidth = this.tabContainer.mTabMinWidth;
          t.width = 0;
-          t.setAttribute("flex", "100");
          t.setAttribute("validate", "never");
          t.className = "tabmail-tab";

--- a/mail/base/content/threadTree.inc.xhtml
+++ b/mail/base/content/threadTree.inc.xhtml
@ -7,7 +7,6 @@
                    <tree id="threadTree"
                          class="plain"
                          persist="lastfoldersent width"
-                          flex="2"
                          treelines="true"
                          enableColumnDrag="true"
                          _selectDelay="250"
@ -81,7 +80,6 @@
                        <splitter class="tree-splitter"/>
                        <treecol id="subjectCol"
                                 persist="ordinal width sortDirection"
-                                 flex="7"
                                 ignoreincolumnpicker="true"
                                 closemenu="none"
                                 label="&subjectColumn.label;"
@ -99,7 +97,6 @@
                        <splitter class="tree-splitter"/>
                        <treecol id="senderCol"
                                 persist="hidden ordinal sortDirection width"
-                                 flex="4"
                                 hidden="true"
                                 closemenu="none"
                                 label="&fromColumn.label;"
@ -107,7 +104,6 @@
                        <splitter class="tree-splitter"/>
                        <treecol id="recipientCol"
                                 persist="hidden ordinal sortDirection width"
-                                 flex="4"
                                 hidden="true"
                                 closemenu="none"
                                 label="&recipientColumn.label;"
@ -115,7 +111,6 @@
                        <splitter class="tree-splitter"/>
                        <treecol id="correspondentCol"
                                 persist="hidden ordinal sortDirection width"
-                                 flex="4"
                                 closemenu="none"
                                 label="&correspondentColumn.label;"
                                 tooltiptext="&correspondentColumn2.tooltip;"/>
@ -132,7 +127,6 @@
                        <splitter class="tree-splitter"/>
                        <treecol id="receivedCol"
                                 persist="hidden ordinal sortDirection width"
-                                 flex="2"
                                 hidden="true"
                                 closemenu="none"
                                 label="&receivedColumn.label;"
@ -140,7 +134,6 @@
                        <splitter class="tree-splitter"/>
                        <treecol id="dateCol"
                                 persist="hidden ordinal sortDirection width"
-                                 flex="2"
                                 closemenu="none"
                                 label="&dateColumn.label;"
                                 tooltiptext="&dateColumn2.tooltip;"/>
--- a/mail/components/addrbook/content/abSearchDialog.xhtml
+++ b/mail/components/addrbook/content/abSearchDialog.xhtml
@ -55,7 +55,7 @@
    <command id="cmd_deleteCard" oncommand="onDelete();"/>
  </commandset>

-    <vbox id="searchTerms" class="themeable-brighttext" flex="3" persist="height">
+    <vbox id="searchTerms" class="themeable-brighttext" persist="height">
      <vbox>
        <hbox align="center">
          <label value="&abSearchHeading.label;" accesskey="&abSearchHeading.accesskey;" control="abPopup"/>
@ -63,7 +63,7 @@
                    oncommand="SelectDirectory(this.value);"
                    alladdressbooks="true"
                    flex="1"/>
-          <spacer flex="3"/>
+          <spacer style="-moz-box-flex: 3;"/>
          <button id="search-button" oncommand="onSearchButton(event);" default="true"/>
        </hbox>
        <hbox align="center">
@ -80,7 +80,7 @@

    <splitter id="gray_horizontal_splitter" collapse="after" persist="state" orient="vertical"/>

-    <vbox id="searchResults" flex="4" persist="height">
+    <vbox id="searchResults" persist="height">
      <vbox id="searchResultListBox" flex="1" >
        <tree id="abResultsTree" flex="1" enableColumnDrag="true" class="plain"
              context="mailContext"
--- a/mail/components/compose/content/MsgComposeCommands.js
+++ b/mail/components/compose/content/MsgComposeCommands.js
@ -3279,7 +3279,6 @@ function manageAttachmentNotification(aForce = false) {

  // Construct the notification as we don't have one.
  let msg = document.createXULElement("hbox");
-  msg.setAttribute("flex", "100");
  msg.onclick = function(event) {
    openOptionsDialog("paneCompose", "compositionAttachmentsCategory", {
      subdialog: "attachment_reminder_button",
@ -3296,7 +3295,6 @@ function manageAttachmentNotification(aForce = false) {
  msg.appendChild(msgKeywords);
  msgKeywords.id = "attachmentKeywords";
  msgKeywords.setAttribute("crop", "end");
-  msgKeywords.setAttribute("flex", "1000");
  msgKeywords.setAttribute("value", keywords);
  let addButton = {
    "l10n-id": "add-attachment-notification-reminder2",
@ -7178,7 +7176,6 @@ function FillIdentityList(menulist) {
      desc.value = item.getAttribute("description");
      desc.classList.add("menu-description");
      desc.setAttribute("crop", "right");
-      desc.setAttribute("flex", "10000");
      item.querySelector("label:last-child").after(desc);
    }
  }
--- a/mail/components/compose/content/dialogs/EdAdvancedEdit.xhtml
+++ b/mail/components/compose/content/dialogs/EdAdvancedEdit.xhtml
@ -64,9 +64,9 @@
              onclick="onSelectHTMLTreeItem();"
              ondblclick="editHTMLAttributeValue(event.target);">
          <treecols>
-            <treecol id="HTMLAttrCol" flex="35" label="&tree.attributeHeader.label;"/>
+            <treecol id="HTMLAttrCol" label="&tree.attributeHeader.label;"/>
            <splitter class="tree-splitter"/>
-            <treecol id="HTMLValCol" flex="65" label="&tree.valueHeader.label;"/>
+            <treecol id="HTMLValCol" label="&tree.valueHeader.label;"/>
          </treecols>
          <treechildren id="HTMLAList" class="gridlines" flex="1"/>
        </tree>
@ -114,9 +114,9 @@
              onclick="onSelectCSSTreeItem();"
              ondblclick="editCSSAttributeValue(event.target);">
          <treecols>
-            <treecol id="CSSPropCol" flex="35" label="&tree.propertyHeader.label;"/>
+            <treecol id="CSSPropCol" label="&tree.propertyHeader.label;"/>
            <splitter class="tree-splitter"/>
-            <treecol id="CSSValCol" flex="65" label="&tree.valueHeader.label;"/>
+            <treecol id="CSSValCol" label="&tree.valueHeader.label;"/>
          </treecols>
          <treechildren id="CSSAList" class="gridlines" flex="1"/>
        </tree>
@ -152,9 +152,9 @@
              onclick="onSelectJSETreeItem();"
              ondblclick="editJSEAttributeValue(event.target);">
          <treecols>
-            <treecol id="AttrCol" flex="35" label="&tree.attributeHeader.label;"/>
+            <treecol id="AttrCol" label="&tree.attributeHeader.label;"/>
            <splitter class="tree-splitter"/>
-            <treecol id="HeaderCol" flex="65" label="&tree.valueHeader.label;"/>
+            <treecol id="HeaderCol" label="&tree.valueHeader.label;"/>
          </treecols>
          <treechildren id="JSEAList" class="gridlines" flex="1"/>
        </tree>
--- a/mail/components/im/content/chat-contact.js
+++ b/mail/components/im/content/chat-contact.js
@ -110,7 +110,7 @@
                          hidden="hidden"/>
            </stack>
            <label crop="end"
-                   flex="100000"
+                   style="-moz-box-flex: 100000;"
                   class="contactStatusText">
            </label>
            <button class="startChatBubble"
--- a/mail/components/im/content/chat-imconv.js
+++ b/mail/components/im/content/chat-imconv.js
@ -69,7 +69,7 @@
            <box class="convUnreadTargetedCount">
              <label class="convUnreadTargetedCountLabel" crop="end"></label>
            </box>
-            <spacer flex="1000000"></spacer>
+            <spacer style="-moz-box-flex: 1000000;"></spacer>
          </hbox>
          `,
          ["chrome://messenger/locale/chat.dtd"]
--- a/mail/components/preferences/cookies.xhtml
+++ b/mail/components/preferences/cookies.xhtml
@ -54,12 +54,12 @@
          onselect="gCookiesWindow.onCookieSelected();"
          hidecolumnpicker="true" seltype="single">
      <treecols>
-        <treecol id="domainCol" data-l10n-id="treecol-site-header" flex="2"
+        <treecol id="domainCol" data-l10n-id="treecol-site-header"
                 primary="true"
                 persist="width"
                 onclick="gCookiesWindow.sort('rawHost');"/>
        <splitter class="tree-splitter"/>
-        <treecol id="nameCol" data-l10n-id="treecol-name-header" flex="1"
+        <treecol id="nameCol" data-l10n-id="treecol-name-header"
                 persist="width"
                 onclick="gCookiesWindow.sort('name');"/>
      </treecols>
--- a/mail/components/preferences/passwordManager.xhtml
+++ b/mail/components/preferences/passwordManager.xhtml
@ -73,32 +73,32 @@
          editable="true"
          context="signonsTreeContextMenu">
      <treecols>
-        <treecol id="providerCol" data-l10n-id="column-heading-provider" flex="40"
+        <treecol id="providerCol" data-l10n-id="column-heading-provider"
                 data-field-name="origin" persist="width"
                 ignoreincolumnpicker="true"
                 sortDirection="ascending"/>
        <splitter class="tree-splitter"/>
-        <treecol id="userCol" data-l10n-id="column-heading-username" flex="25"
+        <treecol id="userCol" data-l10n-id="column-heading-username"
                 ignoreincolumnpicker="true"
                 data-field-name="username" persist="width"/>
        <splitter class="tree-splitter"/>
-        <treecol id="passwordCol" data-l10n-id="column-heading-password" flex="15"
+        <treecol id="passwordCol" data-l10n-id="column-heading-password"
                 ignoreincolumnpicker="true"
                 data-field-name="password" persist="width"
                 hidden="true"/>
        <splitter class="tree-splitter"/>
-        <treecol id="timeCreatedCol" data-l10n-id="column-heading-time-created" flex="10"
+        <treecol id="timeCreatedCol" data-l10n-id="column-heading-time-created"
                 data-field-name="timeCreated" persist="width hidden"
                 hidden="true"/>
        <splitter class="tree-splitter"/>
-        <treecol id="timeLastUsedCol" data-l10n-id="column-heading-time-last-used" flex="20"
+        <treecol id="timeLastUsedCol" data-l10n-id="column-heading-time-last-used"
                 data-field-name="timeLastUsed" persist="width hidden"
                 hidden="true"/>
        <splitter class="tree-splitter"/>
-        <treecol id="timePasswordChangedCol" data-l10n-id="column-heading-time-password-changed" flex="10"
+        <treecol id="timePasswordChangedCol" data-l10n-id="column-heading-time-password-changed"
                 data-field-name="timePasswordChanged" persist="width hidden"/>
        <splitter class="tree-splitter"/>
-        <treecol id="timesUsedCol" data-l10n-id="column-heading-times-used" flex="1"
+        <treecol id="timesUsedCol" data-l10n-id="column-heading-times-used"
                 data-field-name="timesUsed" persist="width hidden"
                 hidden="true"/>
        <splitter class="tree-splitter"/>
--- a/mail/components/preferences/permissions.xhtml
+++ b/mail/components/preferences/permissions.xhtml
@ -59,10 +59,10 @@
          onkeypress="gPermissionManager.onPermissionKeyPress(event)"
          onselect="gPermissionManager.onPermissionSelected();">
      <treecols>
-        <treecol id="siteCol" data-l10n-id="treehead-sitename-label" flex="3"
+        <treecol id="siteCol" data-l10n-id="treehead-sitename-label"
                 data-field-name="rawHost" persist="width"/>
        <splitter class="tree-splitter"/>
-        <treecol id="statusCol" data-l10n-id="treehead-status-label" flex="1"
+        <treecol id="statusCol" data-l10n-id="treehead-status-label"
                 data-field-name="capability" persist="width"/>
      </treecols>
      <treechildren/>
--- a/mail/extensions/openpgp/content/ui/composeKeyStatus.xhtml
+++ b/mail/extensions/openpgp/content/ui/composeKeyStatus.xhtml
@ -44,8 +44,8 @@
               flex="1"
               onselect="onSelectionChange(event);">
    <treecols>
-      <treecol flex="3" data-l10n-id="openpgp-compose-key-status-recipient"/>
-      <treecol flex="2" data-l10n-id="openpgp-compose-key-status-status"/>
+      <treecol id="recipientComposeKeyCol" data-l10n-id="openpgp-compose-key-status-recipient"/>
+      <treecol id="statusComposeKeyCol" data-l10n-id="openpgp-compose-key-status-status"/>
    </treecols>
  </richlistbox>
  <hbox pack="start">
--- a/mail/extensions/openpgp/content/ui/oneRecipientStatus.xhtml
+++ b/mail/extensions/openpgp/content/ui/oneRecipientStatus.xhtml
@ -43,8 +43,8 @@
               flex="1"
               onselect="onSelectionChange(event);">
    <treecols>
-      <treecol flex="3" data-l10n-id="openpgp-one-recipient-status-key-id"/>
-      <treecol flex="4" data-l10n-id="openpgp-one-recipient-status-status"/>
+      <treecol id="recipientKeyIdCol" data-l10n-id="openpgp-one-recipient-status-key-id"/>
+      <treecol id="recipientStatusCol" data-l10n-id="openpgp-one-recipient-status-status"/>
      <treecol flex="1" data-l10n-id="openpgp-one-recipient-status-created-date"/>
      <treecol flex="1" data-l10n-id="openpgp-one-recipient-status-expires-date"/>
    </treecols>
--- a/mail/themes/linux/mail/messageWindow.css
+++ b/mail/themes/linux/mail/messageWindow.css
@ -15,11 +15,7 @@
 }

 #messagepanebox {
+  -moz-box-flex: 3;
  text-shadow: none;
-}
-
-/* ..... message pane adjustments ..... */
-
-#messagepanebox {
  border-bottom: 1px solid ThreeDShadow;
 }
--- a/mail/themes/osx/mail/messageWindow.css
+++ b/mail/themes/osx/mail/messageWindow.css
@ -39,6 +39,10 @@
  box-shadow: none;
 }

+#messagepanebox {
+  -moz-box-flex: 3;
+}
+
 /* ::::: message header borders ::::: */

 #messagepanebox:not(:-moz-lwtheme) {
--- a/mail/themes/shared/mail/EditorDialog.css
+++ b/mail/themes/shared/mail/EditorDialog.css
@ -321,3 +321,17 @@ html|table html|th {
 html|input[type="checkbox"] {
  -moz-appearance: checkbox;
 }
+
+/* Advanced Edit dialog */
+
+#HTMLAttrCol,
+#CSSPropCol,
+#AttrCol {
+  -moz-box-flex: 35;
+}
+
+#HTMLValCol,
+#CSSValCol,
+#HeaderCol {
+  -moz-box-flex: 65;
+}
--- a/mail/themes/shared/mail/feedSubscribe.css
+++ b/mail/themes/shared/mail/feedSubscribe.css
@ -15,6 +15,10 @@
  stroke: var(--default);
 }

+#folderNameCol {
+  -moz-box-flex: 2;
+}
+
 #rssFeedInfoBox {
  border: 1px solid ThreeDShadow;
  margin: 4px;
--- a/mail/themes/shared/mail/fieldMapImport.css
+++ b/mail/themes/shared/mail/fieldMapImport.css
@ -6,6 +6,18 @@ treecolpicker {
  display: none;
 }

+#checkedHeader {
+  -moz-box-flex: 3;
+}
+
+#fieldNameHeader {
+  -moz-box-flex: 7;
+}
+
+#sampleDataHeader {
+  -moz-box-flex: 13;
+}
+
 richlistitem > hbox > checkbox {
  margin: 0;
 }
--- a/mail/themes/shared/mail/mailWindow1.css
+++ b/mail/themes/shared/mail/mailWindow1.css
@ -39,9 +39,8 @@
  text-align: left;
 }

-#folderNameCol [sortDirection="ascending"],
-#folderNameCol [sortDirection="descending"] {
-  list-style-image: none;
+#folderNameCol {
+  -moz-box-flex: 5;
 }

 /* ::::: thread decoration ::::: */
@ -92,6 +91,7 @@ treechildren::-moz-tree-cell-text(dummy) {
   header content over the statusbar. */

 #messagepanebox {
+  -moz-box-flex: 2;
  overflow: hidden;
 }

--- a/mail/themes/shared/mail/message-bar.css
+++ b/mail/themes/shared/mail/message-bar.css
@ -279,6 +279,10 @@ button.ghost-button:not(.semi-transparent):enabled:hover:active {
  font-weight: 500;
 }

+.notification-message > hbox {
+  -moz-box-flex: 100;
+}
+
 .notification-button {
  border: 1px solid var(--in-content-button-border);
  border-radius: 3px;
@ -410,6 +414,7 @@ strong {
 /* Attachment reminder variations */

 #attachmentKeywords {
+  -moz-box-flex: 1000;
  font-weight: bold;
  margin-inline-start: 3px;
  text-decoration: underline;
--- a/mail/themes/shared/mail/messageIcons.css
+++ b/mail/themes/shared/mail/messageIcons.css
@ -8,6 +8,30 @@
  text-align: end;
 }

+#subjectCol {
+  -moz-box-flex: 7;
+}
+
+#senderCol {
+  -moz-box-flex: 4;
+}
+
+#recipientCol {
+  -moz-box-flex: 4;
+}
+
+#correspondentCol {
+  -moz-box-flex: 4;
+}
+
+#receivedCol {
+  -moz-box-flex: 2;
+}
+
+#dateCol {
+  -moz-box-flex: 2;
+}
+
 /* ..... select column ..... */

 .selectColumnHeader {
--- a/mail/themes/shared/mail/messenger.css
+++ b/mail/themes/shared/mail/messenger.css
@ -145,6 +145,10 @@ p {
  color: color-mix(in srgb, currentColor 70%, transparent);
 }

+#threadTree {
+  -moz-box-flex: 2;
+}
+
 .tree-columnpicker-icon {
  list-style-image: var(--icon-column-menu);
  -moz-context-properties: stroke, fill;
@ -1574,6 +1578,11 @@ iframe.devtools-highlighter-renderer {

 /* Print UI, mostly from browser.css */

+.browserContainer,
+.browserStack {
+  -moz-box-flex: 10000;
+}
+
 .printPreviewStack {
  position: relative;
 }
--- a/mail/themes/shared/mail/messengercompose.css
+++ b/mail/themes/shared/mail/messengercompose.css
@ -553,6 +553,10 @@
  list-style-image: var(--icon-print);
 }

+.menu-description {
+  -moz-box-flex: 10000;
+}
+
 .menu-description,
 menulist::part(description) {
  font-style: italic;
--- a/mail/themes/shared/mail/msgSelectOffline.css
+++ b/mail/themes/shared/mail/msgSelectOffline.css
@ -51,10 +51,6 @@ treechildren::-moz-tree-image(syncCol, isServer-true) {
  list-style-image: none;
 }

-#folderNameCol [sortDirection="ascending"] {
-  list-style-image: none;
-}
-
-#folderNameCol [sortDirection="descending"] {
-  list-style-image: none;
+#folderNameCol {
+  -moz-box-flex: 5;
 }
--- a/mail/themes/shared/mail/preferences/dialog.css
+++ b/mail/themes/shared/mail/preferences/dialog.css
@ -118,6 +118,22 @@ textbox.tree-input {
  margin-inline-start: 8px;
 }

+#siteCol {
+  -moz-box-flex: 3;
+}
+
+#statusCol {
+  -moz-box-flex: 1;
+}
+
+#domainCol {
+  -moz-box-flex: 2;
+}
+
+#nameCol {
+  -moz-box-flex: 1;
+}
+
 /* Adjust the Lightning Edit Category dialog */
 #colorSelectRow {
  margin-top: 10px;
--- a/mail/themes/shared/mail/preferences/passwordmgr.css
+++ b/mail/themes/shared/mail/preferences/passwordmgr.css
@ -2,6 +2,34 @@
 * 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/. */

+#providerCol {
+  -moz-box-flex: 40;
+}
+
+#userCol {
+  -moz-box-flex: 25;
+}
+
+#passwordCol {
+  -moz-box-flex: 15;
+}
+
+#timeCreatedCol {
+  -moz-box-flex: 10;
+}
+
+#timeLastUsedCol {
+  -moz-box-flex: 20;
+}
+
+#timePasswordChangedCol {
+  -moz-box-flex: 10;
+}
+
+#timesUsedCol {
+  -moz-box-flex: 1;
+}
+
 treechildren::-moz-tree-image(providerCol) {
  list-style-image: url(chrome://global/skin/icons/defaultFavicon.svg);
  -moz-context-properties: fill;
--- a/mail/themes/shared/mail/primaryToolbar.css
+++ b/mail/themes/shared/mail/primaryToolbar.css
@ -172,6 +172,10 @@ toolbar[mode="text"] .button-appmenu .toolbarbutton-icon {
  display: -moz-box;
 }

+#folder-location-container {
+  -moz-box-flex: 2;
+}
+
 /* Force the folder location and mail view items to fit in the available width
   in the Customize Toolbar dialog. */
 #palette-box #locationFolders,
--- a/mail/themes/shared/mail/quickFilterBar.css
+++ b/mail/themes/shared/mail/quickFilterBar.css
@ -68,6 +68,14 @@
  color: #f66;
 }

+#qfb-qs-textbox {
+  -moz-box-flex: 3;
+}
+
+#quick-filter-bar-tab-bar {
+  -moz-box-flex: 2;
+}
+
 #qfb-filter-bar-spacer {
  min-width: 4px !important;
 }
--- a/mail/themes/shared/mail/searchDialog.css
+++ b/mail/themes/shared/mail/searchDialog.css
@ -6,6 +6,7 @@
@import url("chrome://messenger/skin/messageIcons.css");

 #searchTerms {
+  -moz-box-flex: 3;
  margin-top: 8px;
 }

@ -22,10 +23,15 @@
 }

 #searchResults {
+  -moz-box-flex: 4;
  padding: 0 6px 6px;
  text-shadow: none;
 }

+#searchableFolders {
+  -moz-box-flex: 2;
+}
+
 #searchResultListBox {
  margin: 4px;
  height: 100px;
--- a/mail/themes/shared/mail/subscribe.css
+++ b/mail/themes/shared/mail/subscribe.css
@ -8,6 +8,11 @@

@import url("chrome://messenger/skin/messenger.css");

+#nameColumn,
+#nameColumn2 {
+  -moz-box-flex: 10;
+}
+
 /* ::::: Subscription Icons  :::::: */

 treechildren::-moz-tree-image(subscribedColumn),
--- a/mail/themes/shared/mail/tabmail.css
+++ b/mail/themes/shared/mail/tabmail.css
@ -40,6 +40,7 @@
 .tabmail-tab {
  appearance: none;
  -moz-box-align: stretch;
+  -moz-box-flex: 100;
  background-color: transparent;
  border-radius: 0;
  border-width: 0;
--- a/mail/themes/shared/openpgp/openPgpComposeStatus.css
+++ b/mail/themes/shared/openpgp/openPgpComposeStatus.css
@ -7,3 +7,19 @@
 treecolpicker {
  display: none;
 }
+
+#recipientKeyIdCol {
+  -moz-box-flex: 3;
+}
+
+#recipientStatusCol {
+  -moz-box-flex: 4;
+}
+
+#recipientComposeKeyCol {
+  -moz-box-flex: 3;
+}
+
+#statusComposeKeyCol {
+  -moz-box-flex: 2;
+}
--- a/mail/themes/shared/smime/msgCompSecurityInfo.css
+++ b/mail/themes/shared/smime/msgCompSecurityInfo.css
@ -4,6 +4,22 @@

@import url("chrome://messenger/skin/messenger.css");

+#recipientHeader {
+  -moz-box-flex: 3;
+}
+
+#statusHeader {
+  -moz-box-flex: 1;
+}
+
+#issuedDateHeader {
+  -moz-box-flex: 2;
+}
+
+#expiresDateHeader {
+  -moz-box-flex: 2;
+}
+
 treecolpicker {
  display: none;
 }
--- a/mail/themes/windows/mail/messageWindow.css
+++ b/mail/themes/windows/mail/messageWindow.css
@ -16,6 +16,7 @@
 }

 #messagepanebox {
+  -moz-box-flex: 3;
  text-shadow: none;
  background-color: -moz-Dialog;
 }
--- a/mailnews/base/content/folderProps.xhtml
+++ b/mailnews/base/content/folderProps.xhtml
@ -188,7 +188,7 @@
        <label value="&folderOtherUsers.label;"/>
        <description id="folderOtherUsersText"></description>
      </vbox>
-      <spacer flex="100%"/>
+      <spacer flex="1"/>
      <vbox align="start">
        <button hidefor="pop3,none,rss,nntp" label="&privileges.button.label;"
                oncommand="onFolderPrivileges();" accesskey="&privileges.button.accesskey;"
--- a/mailnews/base/content/msgSelectOfflineFolders.xhtml
+++ b/mailnews/base/content/msgSelectOfflineFolders.xhtml
@ -41,7 +41,7 @@
        onkeypress="gSelectOffline.onKeyPress(event);"
        onclick="gSelectOffline.onClick(event);">
    <treecols>
-      <treecol id="folderNameCol" flex="5" persist="hidden width" label="&MsgSelectItems.label;" primary="true"/>
+      <treecol id="folderNameCol" persist="hidden width" label="&MsgSelectItems.label;" primary="true"/>
      <splitter class="tree-splitter"/>
      <treecol id="syncCol" flex="1" persist="hidden width" label="&MsgSelectInd.label;" cycler="true"/>
    </treecols>
--- a/mailnews/base/content/subscribe.xhtml
+++ b/mailnews/base/content/subscribe.xhtml
@ -95,7 +95,6 @@
                  <treecols id="theSubscribeColumns">
                    <treecol id="nameColumn"
                             primary="true"
-                             flex="10"
                             hideheader="true"
                             crop="center"/>
                    <splitter class="tree-splitter"/>
@ -117,7 +116,6 @@
                  <treecols>
                    <treecol id="nameColumn2"
                             primary="true"
-                             flex="10"
                             hideheader="true"
                             sortDirection="ascending"/>
                    <splitter class="tree-splitter"/>
--- a/mailnews/base/content/virtualFolderListEdit.xhtml
+++ b/mailnews/base/content/virtualFolderListEdit.xhtml
@ -43,7 +43,7 @@
          onclick="gSelectVirtual.onClick(event);">
      <treecols>
        <treecol id="folderNameCol" label="&folderName.label;"
-                 flex="10" primary="true" crop="center"/>
+                 style="-moz-box-flex: 10;" primary="true" crop="center"/>
        <treecol id="selectedCol" label="&folderSearch.label;" flex="1" cycler="true"/>
      </treecols>
      <treechildren/>
--- a/mailnews/base/content/virtualFolderProperties.xhtml
+++ b/mailnews/base/content/virtualFolderProperties.xhtml
@ -107,10 +107,10 @@

  <separator class="thin"/>

-  <vbox flex="2">
+  <vbox style="-moz-box-flex: 2;">
    <label value="&searchTermCaption.label;"/>
    <hbox flex="1">
-      <vbox id="virtualFolderSearchTermListBox" flex="2">
+      <vbox id="virtualFolderSearchTermListBox" style="-moz-box-flex: 2;">
 #include ../../search/content/searchTerm.inc.xhtml
    </hbox>
  </vbox>
--- a/mailnews/extensions/newsblog/feed-subscriptions.xhtml
+++ b/mailnews/extensions/newsblog/feed-subscriptions.xhtml
@ -79,7 +79,6 @@
          seltype="single">
      <treecols>
        <treecol id="folderNameCol"
-                 flex="2"
                 primary="true"
                 hideheader="true"/>
      </treecols>
--- a/mailnews/extensions/smime/msgCompSecurityInfo.xhtml
+++ b/mailnews/extensions/smime/msgCompSecurityInfo.xhtml
@ -44,10 +44,10 @@
               flex="1"
               onselect="onSelectionChange(event);">
    <treecols>
-      <treecol flex="3" label="&tree.recipient;"/>
-      <treecol flex="1" label="&tree.status;"/>
-      <treecol flex="2" label="&tree.issuedDate;"/>
-      <treecol flex="2" label="&tree.expiresDate;"/>
+      <treecol id="recipientHeader" label="&tree.recipient;"/>
+      <treecol id="statusHeader" label="&tree.status;"/>
+      <treecol id="issuedDateHeader" label="&tree.issuedDate;"/>
+      <treecol id="expiresDateHeader" label="&tree.expiresDate;"/>
    </treecols>
  </richlistbox>
  <hbox pack="start">
--- a/mailnews/import/content/fieldMapImport.xhtml
+++ b/mailnews/import/content/fieldMapImport.xhtml
@ -51,9 +51,9 @@
                   flex="1"
                   onselect="disableMoveButtons();">
        <treecols>
-          <treecol flex="3"/>
-          <treecol flex="7" id="fieldNameHeader" label="&fieldMapImport.fieldListTitle;"/>
-          <treecol flex="13" id="sampleDataHeader" label="&fieldMapImport.dataTitle;"/>
+          <treecol id="checkedHeader"/>
+          <treecol id="fieldNameHeader" label="&fieldMapImport.fieldListTitle;"/>
+          <treecol id="sampleDataHeader" label="&fieldMapImport.dataTitle;"/>
        </treecols>
      </richlistbox>

--- a/mailnews/search/content/FilterEditor.xhtml
+++ b/mailnews/search/content/FilterEditor.xhtml
@ -123,11 +123,6 @@
                 style="min-height: 100px;"
                 onfocus="setLastActionFocus();"
                 focusedAction="0">
-      <treecols hidden="true">
-        <treecol flex="&filterActionTypeFlexValue;"/>
-        <treecol flex="&filterActionTargetFlexValue;"/>
-        <treecol/>
-      </treecols>
    </richlistbox>
  </vbox>

--- a/mailnews/search/content/searchTerm.inc.xhtml
+++ b/mailnews/search/content/searchTerm.inc.xhtml
@ -17,9 +17,9 @@
            <hbox id="searchterms" class="themeable-brighttext"/>
            <richlistbox flex="1" id="searchTermList">
              <treecols hidden="true">
-                <treecol flex="&searchTermListAttributesFlexValue;"/>
-                <treecol flex="&searchTermListOperatorsFlexValue;"/>
-                <treecol flex="&searchTermListValueFlexValue;"/>
+                <treecol style="-moz-box-flex: &searchTermListAttributesFlexValue;"/>
+                <treecol style="-moz-box-flex: &searchTermListOperatorsFlexValue;"/>
+                <treecol style="-moz-box-flex: &searchTermListValueFlexValue;"/>
                <treecol class="filler"/>
              </treecols>
            </richlistbox>
--- a/mailnews/search/content/searchTerm.js
+++ b/mailnews/search/content/searchTerm.js
@ -454,8 +454,8 @@ function constructRow(aChildren) {
  listitem.setAttribute("allowevents", "true");
  for (let i = 0; i < aChildren.length; i++) {
    let listcell = document.createXULElement("hbox");
-    if (cols[i].hasAttribute("flex")) {
-      listcell.setAttribute("flex", cols[i].getAttribute("flex"));
+    if (cols[i].hasAttribute("style")) {
+      listcell.setAttribute("style", cols[i].getAttribute("style"));
    }
    let child = aChildren[i];

--- a/mailnews/search/content/searchWidgets.js
+++ b/mailnews/search/content/searchWidgets.js
@ -1451,7 +1451,7 @@
      this.appendChild(
        MozXULElement.parseXULToFragment(
          `
-          <menulist is="ruleactiontype-menulist" flex="&filterActionTypeFlexValue;">
+          <menulist is="ruleactiontype-menulist" style="-moz-box-flex: &filterActionTypeFlexValue;">
            <menupopup>
              <menuitem label="&moveMessage.label;"
                        value="movemessage"
@ -1501,7 +1501,8 @@
            </menupopup>
          </menulist>
          <ruleactiontarget-wrapper class="ruleactiontarget"
-                                    flex="&filterActionTargetFlexValue;"></ruleactiontarget-wrapper>
+                                    style="-moz-box-flex: &filterActionTargetFlexValue;">
+          </ruleactiontarget-wrapper>
          <hbox>
            <button class="small-button"
                    label="+"