Bug 1556936 - Fix contentTabUrlbar regressions from bug 1535265, remove the textbox appearance and use a shared searchBox.css. r=darktrojan ui-r=aleca DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Fri, 07 Jun 2019 11:58:58 +0200
changeset 35801 e24c0dd786996801f0a36f4787043aa2b18b30c3
parent 35800 7ef46c2299364110c9370991d8c8176945c4c5f3
child 35802 ffde4bb2fe1bbca3a4b9ecd027032c1b90f0c5d3
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersdarktrojan, aleca
bugs1556936, 1535265
Bug 1556936 - Fix contentTabUrlbar regressions from bug 1535265, remove the textbox appearance and use a shared searchBox.css. r=darktrojan ui-r=aleca DONTBUILD
mail/base/content/messenger.xul
mail/base/content/specialTabs.js
mail/themes/linux/mail/searchBox.css
mail/themes/linux/mail/tabmail.css
mail/themes/osx/mail/searchBox.css
mail/themes/osx/mail/tabmail.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/searchBox.css
mail/themes/shared/mail/tabmail.css
mail/themes/windows/mail/searchBox.css
mail/themes/windows/mail/tabmail.css
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -727,19 +727,19 @@
       </tabpanels>
      </tabbox>
     </tabmail>
     <vbox id="contentTab" collapsed="true">
       <vbox flex="1" class="contentTabInstance">
         <vbox id="dummycontenttoolbox" class="contentTabToolbox">
           <hbox id="dummycontenttoolbar" class="contentTabToolbar">
             <toolbaritem class="contentTabAddress" align="center" flex="1">
-              <hbox class="themeableSearchBox" align="center" flex="1">
+              <hbox align="center" flex="1">
                 <image class="contentTabSecurity"/>
-                <label class="contentTabUrlbar" crop="end" flex="1"/>
+                <label class="contentTabUrlbar" flex="1"/>
               </hbox>
             </toolbaritem>
           </hbox>
         </vbox>
         <browser id="dummycontentbrowser" type="content" flex="1"
                  disablehistory="true" autocompletepopup="PopupAutoComplete"
                  context="mailContext"/>
       </vbox>
--- a/mail/base/content/specialTabs.js
+++ b/mail/base/content/specialTabs.js
@@ -154,17 +154,19 @@ tabProgressListener.prototype = {
         level = "high";
         break;
       case wpl.STATE_IS_BROKEN:
         level = "broken";
         break;
     }
     if (level) {
       this.mTab.security.setAttribute("level", level);
+      this.mTab.security.hidden = false;
     } else {
+      this.mTab.security.hidden = true;
       this.mTab.security.removeAttribute("level");
     }
   },
   onContentBlockingEvent(aWebProgress, aRequest, aEvent) {
     if (this.mProgressListener)
       this.mProgressListener.onContentBlockingEvent(aWebProgress, aRequest, aEvent);
   },
   onRefreshAttempted(aWebProgress, aURI, aDelay, aSameURI) {
@@ -736,17 +738,17 @@ var specialTabs = {
       aTab.panel.appendChild(clone);
       aTab.root = clone;
 
       // Start setting up the browser.
       aTab.browser = aTab.panel.querySelector("browser");
       aTab.toolbar = aTab.panel.querySelector(".contentTabToolbar");
       aTab.security = aTab.panel.querySelector(".contentTabSecurity");
       aTab.urlbar = aTab.panel.querySelector(".contentTabUrlbar");
-      aTab.urlbar.setAttribute("value", aArgs.contentPage);
+      aTab.urlbar.textContent = aArgs.contentPage;
 
       ExtensionParent.apiManager.emit("extension-browser-inserted", aTab.browser);
 
       // As we're opening this tab, showTab may not get called, so set
       // the type according to if we're opening in background or not.
       let background = ("background" in aArgs) && aArgs.background;
       aTab.browser.setAttribute("type", "content");
       if (background)
--- a/mail/themes/linux/mail/searchBox.css
+++ b/mail/themes/linux/mail/searchBox.css
@@ -1,16 +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/.
-*/
-:root {
-  --toolbar-field-focus-border-color: Highlight;
-}
+/* 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/. */
+
+@import url("chrome://messenger/skin/shared/searchBox.css");
 
 .quick-search-textbox {
   padding-top: 1px;
 }
 
 .searchBox > hbox,
 .themeableSearchBox > hbox {
   -moz-box-ordinal-group: 1;
@@ -29,24 +26,16 @@
 .textbox-search-icon[searchbutton],
 textbox:not([searchbutton]) > .textbox-input-box > .textbox-search-sign {
   list-style-image: url(chrome://messenger/skin/icons/search-glass.svg);
   -moz-context-properties: fill;
   fill: currentColor;
   opacity: 0.54;
 }
 
-.textbox-search-clear {
-  opacity: 0.8;
-}
-
-.textbox-search-clear:not([disabled]):hover {
-  opacity: 1;
-}
-
 .remote-gloda-search-container {
   padding-top: 3px;
   padding-bottom: 2px;
 }
 
 .searchBox,
 .themeableSearchBox {
   -moz-appearance: none;
@@ -54,111 +43,16 @@ textbox:not([searchbutton]) > .textbox-i
   background-color: -moz-field;
   border: 1px solid ThreeDShadow;
   border-radius: 2px;
   box-shadow: 0 1px 4px rgba(0,0,0,.05);
   padding: 3px;
   margin: 0 3px;
 }
 
-.searchBox:hover,
-.themeableSearchBox:hover {
-  border-color: hsla(240,5%,5%,.35);
-  box-shadow: 0 1px 6px rgba(0,0,0,.1);
-}
-
-.searchBox:-moz-lwtheme-brighttext:hover,
-.themeableSearchBox:-moz-lwtheme-brighttext:hover {
-  box-shadow: 0 1px 3px rgba(255,255,255,.1);
-}
-
 .searchBox[focused="true"],
 .themeableSearchBox[focused="true"] {
   border-color: Highlight;
 }
 
-/* special treatment because these boxes are on themable toolbars */
-#searchInput:-moz-lwtheme,
-#IMSearchInput:-moz-lwtheme,
-#peopleSearchInput:-moz-lwtheme,
-.themeableSearchBox:-moz-lwtheme,
-.remote-gloda-search:-moz-lwtheme {
-  background-color: var(--lwt-toolbar-field-background-color, hsla(0,0%,100%,.8));
-  color: var(--lwt-toolbar-field-color, black);
-}
-
-#searchInput:not([focused="true"]):-moz-lwtheme,
-#IMSearchInput:not([focused="true"]):-moz-lwtheme,
-#peopleSearchInput:not([focused="true"]):-moz-lwtheme,
-.themeableSearchBox:not([focused="true"]):-moz-lwtheme,
-.remote-gloda-search:not([focused="true"]):-moz-lwtheme {
-  border-color: var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.25));
-}
-#searchInput:-moz-lwtheme:hover,
-#IMSearchInput:-moz-lwtheme:hover,
-#peopleSearchInput:-moz-lwtheme:hover,
-.themeableSearchBox:-moz-lwtheme:hover,
-.remote-gloda-search:-moz-lwtheme:hover {
-  background-color: var(--lwt-toolbar-field-background-color, white);
-}
-
-#searchInput:-moz-lwtheme[focused="true"],
-#IMSearchInput:-moz-lwtheme[focused="true"],
-#peopleSearchInput:-moz-lwtheme[focused="true"],
-.themeableSearchBox:-moz-lwtheme[focused="true"],
-.remote-gloda-search:-moz-lwtheme[focused="true"] {
-  background-color: var(--lwt-toolbar-field-focus, var(--lwt-toolbar-field-background-color, white));
-  color: var(--lwt-toolbar-field-focus-color, var(--lwt-toolbar-field-color, black));
-  border-color: var(--toolbar-field-focus-border-color);
-}
-
-:root[lwt-selection] #searchInput .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] #IMSearchInput .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] #peopleSearchInput .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] .themeableSearchBox .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] .remote-gloda-search .textbox-input:-moz-lwtheme::selection {
-  background-color: var(--lwt-toolbar-field-highlight, Highlight);
-  color: var(--lwt-toolbar-field-highlight-text, HighlightText);
+.autocomplete-richlistitem[type^="gloda-"] {
+  padding-inline-start: 10px;
 }
-
-#PopupGlodaAutocomplete {
-  margin-top: -1px;
-  border: 1px solid ThreeDShadow;
-  background: var(--autocomplete-popup-background);
-  color: var(--autocomplete-popup-color);
-  border-color: var(--autocomplete-popup-border-color);
-  -moz-appearance: none;
-}
-
-#PopupGlodaAutocomplete .ac-url {
-  display: -moz-box;
-  margin-bottom: 2px;
-}
-
-.ac-url:not([selected=true]) > .ac-url-text {
-  color: var(--urlbar-popup-url-color);
-}
-
-.ac-action:not([selected=true]) > .ac-url-text {
-  color: var(--urlbar-popup-action-color);
-}
-
-#PopupGlodaAutocomplete > .autocomplete-richlistbox {
-  padding: 2px 0;
-  color: inherit;
-  background-color: inherit;
-}
-
-.autocomplete-richlistitem[type^="gloda-"] {
-  margin-right: 2px;
-  margin-left: 2px;
-  padding-inline-start: 10px;
-  border-radius: 2px;
-}
-
-.autocomplete-richlistitem[type^="gloda-"]:hover {
-  background-color: hsla(0,0%,80%,.3);
-}
-
-.autocomplete-richlistitem[type^="gloda-"][selected] {
-  background: var(--autocomplete-popup-highlight-background);
-  color: var(--autocomplete-popup-highlight-color);
-}
--- a/mail/themes/linux/mail/tabmail.css
+++ b/mail/themes/linux/mail/tabmail.css
@@ -112,9 +112,11 @@ tabpanels {
 
 .alltabs-item > .menu-iconic-left {
   visibility: visible !important;
 }
 
 /* Content Tabs */
 .contentTabAddress {
   height: 32px;
+  padding-left: 10px;
+  padding-right: 10px;
 }
--- a/mail/themes/osx/mail/searchBox.css
+++ b/mail/themes/osx/mail/searchBox.css
@@ -1,17 +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/.
-*/
+/* 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/. */
 
-:root {
-  --toolbar-field-focus-border-color: -moz-mac-focusring;
-}
+@import url("chrome://messenger/skin/shared/searchBox.css");
 
 .searchBox,
 .themeableSearchBox {
   margin-top: 3px;
   margin-bottom: 2px;
   -moz-appearance: none !important;
   border: 1px solid hsla(240,5%,5%,.25);
   border-radius: 3px;
@@ -25,133 +21,30 @@
   fill-opacity: 0.8;
   background-clip: padding-box;
   background-image: url("chrome://global/skin/icons/search-textbox.svg");
   background-repeat: no-repeat;
   background-position: 5px center;
   -moz-box-align: center;
 }
 
-.searchBox:hover,
-.themeableSearchBox:hover {
-  border-color: hsla(240,5%,5%,.35);
-  box-shadow: 0 1px 6px rgba(0,0,0,.1);
-}
-
-.searchBox:-moz-lwtheme-brighttext:hover,
-.themeableSearchBox:-moz-lwtheme-brighttext:hover {
-  box-shadow: 0 1px 3px rgba(255,255,255,.1);
-}
-
+/* special treatment because these boxes are on themable toolbars */
 .searchBox[focused="true"],
 .themeableSearchBox[focused="true"] {
   border-color: -moz-mac-focusring;
   box-shadow: var(--focus-ring-box-shadow);
 }
 
-/* special treatment because these boxes are on themable toolbars */
 #searchInput,
 #IMSearchInput,
 #peopleSearchInput {
   margin-top: 2px;
   margin-bottom: 3px;
 }
-#searchInput:-moz-lwtheme,
-#IMSearchInput:-moz-lwtheme,
-#peopleSearchInput:-moz-lwtheme,
-.themeableSearchBox:-moz-lwtheme,
-.remote-gloda-search:-moz-lwtheme {
-  background-color: var(--lwt-toolbar-field-background-color, hsla(0,0%,100%,.8));
-  color: var(--lwt-toolbar-field-color, black);
-}
-
-#searchInput:not([focused="true"]):-moz-lwtheme,
-#IMSearchInput:not([focused="true"]):-moz-lwtheme,
-#peopleSearchInput:not([focused="true"]):-moz-lwtheme,
-.themeableSearchBox:not([focused="true"]):-moz-lwtheme,
-.remote-gloda-search:not([focused="true"]):-moz-lwtheme {
-  border-color: var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.25));
-}
-
-#searchInput:-moz-lwtheme:hover,
-#IMSearchInput:-moz-lwtheme:hover,
-#peopleSearchInput:-moz-lwtheme:hover,
-.themeableSearchBox:-moz-lwtheme:hover,
-.remote-gloda-search:-moz-lwtheme:hover {
-  background-color: var(--lwt-toolbar-field-background-color, white);
-}
-
-#searchInput:-moz-lwtheme[focused="true"],
-#IMSearchInput:-moz-lwtheme[focused="true"],
-#peopleSearchInput:-moz-lwtheme[focused="true"],
-.themeableSearchBox:-moz-lwtheme[focused="true"],
-.remote-gloda-search:-moz-lwtheme[focused="true"] {
-  background-color: var(--lwt-toolbar-field-focus, var(--lwt-toolbar-field-background-color, white));
-  color: var(--lwt-toolbar-field-focus-color, var(--lwt-toolbar-field-color, black));
-  border-color: var(--toolbar-field-focus-border-color);
-  box-shadow: 0 0 0 1px var(--toolbar-field-focus-border-color) inset,
-              0 0 0 1px var(--toolbar-field-focus-border-color);
-}
-
-:root[lwt-selection] #searchInput .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] #IMSearchInput .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] #peopleSearchInput .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] .themeableSearchBox .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] .remote-gloda-search .textbox-input:-moz-lwtheme::selection {
-  background-color: var(--lwt-toolbar-field-highlight, Highlight);
-  color: var(--lwt-toolbar-field-highlight-text, HighlightText);
-}
-
-.textbox-search-clear {
-  opacity: 0.8;
-}
-
-.textbox-search-clear:not([disabled]):hover {
-  opacity: 1;
-}
 
 .remote-gloda-search-container {
   padding-top: 1px;
   padding-bottom: 1px;
 }
 
-#PopupGlodaAutocomplete {
-  margin-top: -1px;
-  background: var(--autocomplete-popup-background);
-  color: var(--autocomplete-popup-color);
-  border-color: var(--autocomplete-popup-border-color);
-  -moz-appearance: none;
-}
-
-#PopupGlodaAutocomplete .ac-url {
-  display: -moz-box;
-  margin-bottom: 2px;
-}
-
-.ac-url:not([selected=true]) > .ac-url-text {
-  color: var(--urlbar-popup-url-color);
-}
-
-.ac-action:not([selected=true]) > .ac-url-text {
-  color: var(--urlbar-popup-action-color);
+.autocomplete-richlistitem[type^="gloda-"] {
+  padding-inline-start: 13px;
 }
-
-#PopupGlodaAutocomplete > .autocomplete-richlistbox {
-  padding: 2px 0;
-  color: inherit;
-  background-color: inherit;
-}
-
-.autocomplete-richlistitem[type^="gloda-"] {
-  margin-right: 2px;
-  margin-left: 2px;
-  padding-inline-start: 13px;
-  border-radius: 2px;
-}
-
-.autocomplete-richlistitem[type^="gloda-"]:hover {
-  background-color: hsla(210,4%,10%,.07);
-}
-
-.autocomplete-richlistitem[type^="gloda-"][selected] {
-  background: var(--autocomplete-popup-highlight-background);
-  color: var(--autocomplete-popup-highlight-color);
-}
--- a/mail/themes/osx/mail/tabmail.css
+++ b/mail/themes/osx/mail/tabmail.css
@@ -197,9 +197,11 @@ tabmail > tabbox > tabpanels {
   alltabs-item[busy] {
     list-style-image: url("chrome://global/skin/icons/loading@2x.png") !important;
   }
 }
 
 /* Content Tabs */
 .contentTabAddress {
   height: 31px;
+  padding-left: 10px;
+  padding-right: 10px;
 }
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -112,16 +112,17 @@
   skin/classic/messenger/shared/in-content/display.svg        (../shared/mail/incontentprefs/display.svg)
   skin/classic/messenger/shared/in-content/general.svg        (../shared/mail/incontentprefs/general.svg)
   skin/classic/messenger/shared/in-content/privacy.svg        (../shared/mail/incontentprefs/privacy.svg)
   skin/classic/messenger/shared/in-content/security.svg       (../shared/mail/incontentprefs/security.svg)
   skin/classic/messenger/shared/mailWindow1.css               (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messengercompose.css          (../shared/mail/messengercompose.css)
+  skin/classic/messenger/shared/searchBox.css                 (../shared/mail/searchBox.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
   skin/classic/messenger/tagColors.css                        (../shared/mail/tagColors.css)
   skin/classic/messenger/shared/smime/smime-compose.css       (../shared/mail/smime/smime-compose.css)
 #ifndef XP_MACOSX
   skin/classic/messenger/icons/anchor.svg                     (../shared/mail/icons/anchor.svg)
   skin/classic/messenger/icons/bold.svg                       (../shared/mail/icons/bold.svg)
   skin/classic/messenger/icons/bullet-list.svg                (../shared/mail/icons/bullet-list.svg)
   skin/classic/messenger/messengercompose/format-dropmarker.svg (../shared/mail/icons/format-dropmarker.svg)
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/searchBox.css
@@ -0,0 +1,118 @@
+/* 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/. */
+
+:root {
+  --toolbar-field-focus-border-color: Highlight;
+}
+
+.textbox-search-clear {
+  opacity: 0.8;
+}
+
+.textbox-search-clear:not([disabled]):hover {
+  opacity: 1;
+}
+
+.themeableSearchBox[disabled] {
+  border-color: hsla(240,5%,5%,.1) !important;
+}
+
+.searchBox:hover,
+.themeableSearchBox:not([disabled]):hover {
+  border-color: hsla(240,5%,5%,.35);
+  box-shadow: 0 1px 6px rgba(0,0,0,.1);
+}
+
+.searchBox:-moz-lwtheme-brighttext:hover,
+.themeableSearchBox:-moz-lwtheme-brighttext:not([disabled]):hover {
+  box-shadow: 0 1px 3px rgba(255,255,255,.1);
+}
+
+/* special treatment because these boxes are on themable toolbars */
+#searchInput:-moz-lwtheme,
+#IMSearchInput:-moz-lwtheme,
+#peopleSearchInput:-moz-lwtheme,
+.themeableSearchBox:-moz-lwtheme,
+.remote-gloda-search:-moz-lwtheme {
+  background-color: var(--lwt-toolbar-field-background-color, hsla(0,0%,100%,.8));
+  color: var(--lwt-toolbar-field-color, black);
+}
+
+#searchInput:not([focused="true"]):-moz-lwtheme,
+#IMSearchInput:not([focused="true"]):-moz-lwtheme,
+#peopleSearchInput:not([focused="true"]):-moz-lwtheme,
+.themeableSearchBox:not([focused="true"]):-moz-lwtheme,
+.remote-gloda-search:not([focused="true"]):-moz-lwtheme {
+  border-color: var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.25));
+}
+
+#searchInput:-moz-lwtheme:hover,
+#IMSearchInput:-moz-lwtheme:hover,
+#peopleSearchInput:-moz-lwtheme:hover,
+.themeableSearchBox:-moz-lwtheme:not([disabled]):hover,
+.remote-gloda-search:-moz-lwtheme:hover {
+  background-color: var(--lwt-toolbar-field-background-color, white);
+}
+
+#searchInput:-moz-lwtheme[focused="true"],
+#IMSearchInput:-moz-lwtheme[focused="true"],
+#peopleSearchInput:-moz-lwtheme[focused="true"],
+.themeableSearchBox:-moz-lwtheme[focused="true"],
+.remote-gloda-search:-moz-lwtheme[focused="true"] {
+  background-color: var(--lwt-toolbar-field-focus, var(--lwt-toolbar-field-background-color, white));
+  color: var(--lwt-toolbar-field-focus-color, var(--lwt-toolbar-field-color, black));
+  border-color: var(--toolbar-field-focus-border-color);
+}
+
+:root[lwt-selection] #searchInput .textbox-input:-moz-lwtheme::selection,
+:root[lwt-selection] #IMSearchInput .textbox-input:-moz-lwtheme::selection,
+:root[lwt-selection] #peopleSearchInput .textbox-input:-moz-lwtheme::selection,
+:root[lwt-selection] .themeableSearchBox .textbox-input:-moz-lwtheme::selection,
+:root[lwt-selection] .remote-gloda-search .textbox-input:-moz-lwtheme::selection {
+  background-color: var(--lwt-toolbar-field-highlight, Highlight);
+  color: var(--lwt-toolbar-field-highlight-text, HighlightText);
+}
+
+#PopupGlodaAutocomplete {
+  -moz-appearance: none;
+  margin-top: -1px;
+  background: var(--autocomplete-popup-background);
+  color: var(--autocomplete-popup-color);
+  border-color: var(--autocomplete-popup-border-color);
+}
+
+#PopupGlodaAutocomplete > .autocomplete-richlistbox {
+  padding: 2px 0;
+  color: inherit;
+  background-color: inherit;
+}
+
+#PopupGlodaAutocomplete .ac-url {
+  display: -moz-box;
+  margin-bottom: 2px;
+}
+
+.ac-url:not([selected=true]) > .ac-url-text {
+  color: var(--urlbar-popup-url-color);
+}
+
+.ac-action:not([selected=true]) > .ac-url-text {
+  color: var(--urlbar-popup-action-color);
+}
+
+.autocomplete-richlistitem[type^="gloda-"] {
+  margin-right: 2px;
+  margin-left: 2px;
+  padding-inline-start: 12px;
+  border-radius: 2px;
+}
+
+.autocomplete-richlistitem[type^="gloda-"]:hover {
+  background-color: hsla(0,0%,80%,.3);
+}
+
+.autocomplete-richlistitem[type^="gloda-"][selected] {
+  background: var(--autocomplete-popup-highlight-background);
+  color: var(--autocomplete-popup-highlight-color);
+}
--- a/mail/themes/shared/mail/tabmail.css
+++ b/mail/themes/shared/mail/tabmail.css
@@ -350,16 +350,23 @@
 }
 
 /* Content Tabs */
 .chromeTabInstance[collapsed="false"] .contentTabToolbox,
 .contentTabInstance[collapsed="false"] .contentTabToolbox {
   display: none;
 }
 
+/* Both rules are needed to work properly when re-activating the window */
+.contentTabUrlbar:-moz-window-inactive,
+.contentTabUrlbar:-moz-window-inactive::selection {
+  background-color: transparent;
+  color: inherit;
+}
+
 .contentTabSecurity {
   height: 16px;
   width: 16px;
   margin: 2px;
   margin-inline-end: 5px;
   background-repeat: no-repeat;
 }
 
--- a/mail/themes/windows/mail/searchBox.css
+++ b/mail/themes/windows/mail/searchBox.css
@@ -1,15 +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/. */
 
-:root {
-  --toolbar-field-focus-border-color: Highlight;
-}
+@import url("chrome://messenger/skin/shared/searchBox.css");
 
 /*
  * The emptytext style would appear to use italics.  This is causing
  * problems for the search box because it has no minwidth and is flexy, so
  * removing the emptytext causes the size of the box to change and this is silly
  * and undesirable.  This change is being made to maintain the generally
  * accepted status quo while reducing breakage.  This will cause visual
  * inconsistency with the quick filter bar unless it gets a change like this
@@ -46,24 +44,16 @@ textbox:not([searchbutton]) > .textbox-i
 .textbox-search-icon[searchbutton],
 textbox:not([searchbutton]) > .textbox-input-box > .textbox-search-sign {
   list-style-image: url(chrome://messenger/skin/icons/search-glass.svg);
   -moz-context-properties: fill;
   fill: currentColor;
   opacity: 0.54;
 }
 
-.textbox-search-clear {
-  opacity: 0.8;
-}
-
-.textbox-search-clear:not([disabled]):hover {
-  opacity: 1;
-}
-
 .remote-gloda-search-container {
   padding-top: 1px;
   padding-bottom: 1px;
 }
 
 .searchBox,
 .themeableSearchBox {
   -moz-appearance: none;
@@ -89,118 +79,24 @@ textbox:not([searchbutton]) > .textbox-i
 /* Add margins to show the hover box-shadow */
 #searchInput,
 #IMSearchInput,
 #peopleSearchInput {
   margin-top: 3px;
   margin-bottom: 3px;
 }
 
-.searchBox:hover,
-.themeableSearchBox:hover {
-  border-color: hsla(240,5%,5%,.35);
-  box-shadow: 0 1px 6px rgba(0,0,0,.1);
-}
-
-.searchBox:-moz-lwtheme-brighttext:hover,
-.themeableSearchBox:-moz-lwtheme-brighttext:hover {
-  box-shadow: 0 1px 3px rgba(255,255,255,.1);
-}
-
 .searchBox[focused="true"],
 .themeableSearchBox[focused="true"] {
   border-color: Highlight;
 }
 
 /* special treatment because these boxes are on themable toolbars */
 #searchInput,
 #IMSearchInput,
 #peopleSearchInput,
 .remote-gloda-search {
   min-height: 26px;
 }
 
-#searchInput:-moz-lwtheme,
-#IMSearchInput:-moz-lwtheme,
-#peopleSearchInput:-moz-lwtheme,
-.themeableSearchBox:-moz-lwtheme,
-.remote-gloda-search:-moz-lwtheme {
-  background-color: var(--lwt-toolbar-field-background-color, hsla(0,0%,100%,.8));
-  color: var(--lwt-toolbar-field-color, black);
-}
-
-#searchInput:not([focused="true"]):-moz-lwtheme,
-#IMSearchInput:not([focused="true"]):-moz-lwtheme,
-#peopleSearchInput:not([focused="true"]):-moz-lwtheme,
-.themeableSearchBox:not([focused="true"]):-moz-lwtheme,
-.remote-gloda-search:not([focused="true"]):-moz-lwtheme {
-  border-color: var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.25));
-}
-
-#searchInput:-moz-lwtheme:hover,
-#IMSearchInput:-moz-lwtheme:hover,
-#peopleSearchInput:-moz-lwtheme:hover,
-.themeableSearchBox:-moz-lwtheme:hover,
-.remote-gloda-search:-moz-lwtheme:hover {
-  background-color: var(--lwt-toolbar-field-background-color, white);
-}
-
-#searchInput:-moz-lwtheme[focused="true"],
-#IMSearchInput:-moz-lwtheme[focused="true"],
-#peopleSearchInput:-moz-lwtheme[focused="true"],
-.themeableSearchBox:-moz-lwtheme[focused="true"],
-.remote-gloda-search:-moz-lwtheme[focused="true"] {
-  background-color: var(--lwt-toolbar-field-focus, var(--lwt-toolbar-field-background-color, white));
-  color: var(--lwt-toolbar-field-focus-color, var(--lwt-toolbar-field-color, black));
-  border-color: var(--toolbar-field-focus-border-color);
-}
-
-:root[lwt-selection] #searchInput .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] #IMSearchInput .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] #peopleSearchInput .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] .themeableSearchBox .textbox-input:-moz-lwtheme::selection,
-:root[lwt-selection] .remote-gloda-search .textbox-input:-moz-lwtheme::selection {
-  background-color: var(--lwt-toolbar-field-highlight, Highlight);
-  color: var(--lwt-toolbar-field-highlight-text, HighlightText);
+.autocomplete-richlistitem[type^="gloda-"] {
+  padding-inline-start: 12px;
 }
-
-#PopupGlodaAutocomplete {
-  -moz-appearance: none;
-  margin-top: -1px;
-  background: var(--autocomplete-popup-background);
-  color: var(--autocomplete-popup-color);
-  border-color: var(--autocomplete-popup-border-color);
-}
-
-#PopupGlodaAutocomplete > .autocomplete-richlistbox {
-  padding: 2px 0;
-  color: inherit;
-  background-color: inherit;
-}
-
-#PopupGlodaAutocomplete .ac-url {
-  display: -moz-box;
-  margin-bottom: 2px;
-}
-
-.ac-url:not([selected=true]) > .ac-url-text {
-  color: var(--urlbar-popup-url-color);
-}
-
-.ac-action:not([selected=true]) > .ac-url-text {
-  color: var(--urlbar-popup-action-color);
-}
-
-.autocomplete-richlistitem[type^="gloda-"] {
-  margin-right: 2px;
-  margin-left: 2px;
-  padding-inline-start: 12px;
-  border-radius: 2px;
-}
-
-.autocomplete-richlistitem[type^="gloda-"]:hover {
-  background-color: hsla(0,0%,80%,.3);
-}
-
-.autocomplete-richlistitem[type^="gloda-"][selected] {
-  background: var(--autocomplete-popup-highlight-background);
-  color: var(--autocomplete-popup-highlight-color);
-}
--- a/mail/themes/windows/mail/tabmail.css
+++ b/mail/themes/windows/mail/tabmail.css
@@ -140,16 +140,18 @@ tabpanels {
 
 .tabs-alltabs-button > hbox > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
 /* Content Tabs */
 .contentTabAddress {
   height: 34px;
+  padding-left: 10px;
+  padding-right: 10px;
 }
 
 @media (-moz-os-version: windows-win7) and (-moz-windows-default-theme) {
   @media (-moz-windows-glass: 0) {
     :root[tabsintitlebar][sizemode=normal] #mail-toolbar-menubar2[autohide=true][inactive] ~
       #tabs-toolbar {
       margin-top: 6px;
     }