Bug 1694797 - Follow in search dialog the changes from bug 1689876. r=mkmelin a=wsmwk
authorRichard Marti <richard.marti@gmail.com>
Thu, 25 Feb 2021 12:58:09 +0200
changeset 41374 c51f65b31f56ab402f48c878c84372597632d3c8
parent 41373 bb278641e073bcb23f32e35c3111c64cb28801bd
child 41375 c96075bebc300da8a4eded9e455eb00ac03ed255
push id2989
push userthunderbird@calypsoblue.org
push dateMon, 01 Mar 2021 19:24:13 +0000
treeherdercomm-beta@c96075bebc30 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin, wsmwk
bugs1694797, 1689876
Bug 1694797 - Follow in search dialog the changes from bug 1689876. r=mkmelin a=wsmwk
mail/base/content/SearchDialog.xhtml
mail/components/addrbook/content/abSearchDialog.xhtml
mail/themes/linux/mail/searchDialog.css
mail/themes/osx/mail/searchDialog.css
mail/themes/shared/mail/searchDialog.css
mail/themes/windows/mail/searchDialog.css
--- a/mail/base/content/SearchDialog.xhtml
+++ b/mail/base/content/SearchDialog.xhtml
@@ -3,16 +3,17 @@
 # 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/.
 
 #filter substitution
 #define SEARCH_WINDOW
 <?xml-stylesheet href="chrome://messenger/skin/searchDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/tagColors.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 
 <!DOCTYPE window [
   <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
   %messengerDTD;
   <!ENTITY % SearchDialogDTD SYSTEM "chrome://messenger/locale/SearchDialog.dtd">
   %SearchDialogDTD;
--- a/mail/components/addrbook/content/abSearchDialog.xhtml
+++ b/mail/components/addrbook/content/abSearchDialog.xhtml
@@ -1,15 +1,16 @@
 <?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://messenger/skin/searchDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/abResultsPane.css" type="text/css"?>
 
 <!DOCTYPE window [
   <!ENTITY % abResultsPaneDTD SYSTEM "chrome://messenger/locale/addressbook/abResultsPane.dtd">
   %abResultsPaneDTD;
   <!ENTITY % SearchDialogDTD SYSTEM "chrome://messenger/locale/SearchDialog.dtd">
   %SearchDialogDTD;
--- a/mail/themes/linux/mail/searchDialog.css
+++ b/mail/themes/linux/mail/searchDialog.css
@@ -3,18 +3,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== searchDialog.css ===============================================
   == Styles for the Mail Search dialog.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/shared/searchDialog.css");
 
-menulist {
-  width: 12em;
+.search-menulist,
+.search-value-menulist {
+  width: 16em;
 }
 
 .small-button {
   min-width: 3em;
   margin: 2px;
 }
 
 .small-button + .small-button {
--- a/mail/themes/osx/mail/searchDialog.css
+++ b/mail/themes/osx/mail/searchDialog.css
@@ -21,22 +21,19 @@
   margin-inline-start: 4px;
 }
 
 :root:not([lwt-tree]) #searchResultListBox {
   appearance: auto;
   -moz-default-appearance: listbox;
 }
 
-menulist {
-  width: 18em;
-}
-
-.search-menulist {
-  width: 12em;
+.search-menulist,
+.search-value-menulist {
+  width: 14.5em;
 }
 
 .small-button {
   min-width: 22px;
   height: 20px;
   padding: 0;
   padding-inline-end: 1px;
   padding-bottom: 1px;
--- a/mail/themes/shared/mail/searchDialog.css
+++ b/mail/themes/shared/mail/searchDialog.css
@@ -26,16 +26,21 @@
   text-shadow: none;
 }
 
 #searchResultListBox {
   margin: 4px;
   height: 100px;
 }
 
+.search-value-menulist,
+.search-value-textbox[type="number"] {
+  flex: 1;
+}
+
 .search-menulist[unavailable="true"] {
   color: GrayText;
 }
 
 radio[value="and"] {
   margin-inline-end: 18px;
 }
 
--- a/mail/themes/windows/mail/searchDialog.css
+++ b/mail/themes/windows/mail/searchDialog.css
@@ -9,18 +9,19 @@
 @import url("chrome://messenger/skin/shared/searchDialog.css");
 
 :root:not([lwt-tree]) #threadTree,
 :root:not([lwt-tree]) #abResultsTree {
   appearance: auto;
   -moz-default-appearance: listbox;
 }
 
-menulist {
-  width: 12em;
+.search-menulist,
+.search-value-menulist {
+  width: 11em;
 }
 
 .small-button {
   min-width: 3em;
   margin: 2px;
 }
 
 .small-button + .small-button {