Bug 1236164 - Add the searchBox class to the Contacts sidebar search. r=aleth a=jorgk
authorRichard Marti <richard.marti@gmail.com>
Wed, 06 Jan 2016 19:34:35 +0100
changeset 26642 98ebf79bc3aba8bd962f73f87a90e04ef84238ac
parent 26641 314f07a4926ef68e552d09595f4357eecffcf624
child 26643 c30508ebf85e37ddb8f4c7dc8279e17e50111b87
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleth, jorgk
bugs1236164
Bug 1236164 - Add the searchBox class to the Contacts sidebar search. r=aleth a=jorgk
mail/components/addrbook/content/abContactsPanel.xul
mail/themes/windows/mail/addrbook/abContactsPanel.css
mail/themes/windows/mail/searchBox.css
--- a/mail/components/addrbook/content/abContactsPanel.xul
+++ b/mail/components/addrbook/content/abContactsPanel.xul
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 
-<!--  -*- Mode: xml; indent-tabs-mode: nil; -*-
-   - This Source Code Form is subject to the terms of the Mozilla Public
+<!-- 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/searchBox.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/abContactsPanel.css" type="text/css"?>
 
 <!DOCTYPE page [
 <!ENTITY % abResultsPaneOverlayDTD SYSTEM "chrome://messenger/locale/addressbook/abResultsPaneOverlay.dtd" >
 %abResultsPaneOverlayDTD;
 <!ENTITY % abContactsPanelDTD SYSTEM "chrome://messenger/locale/addressbook/abContactsPanel.dtd" >
 %abContactsPanelDTD;
 ]>
@@ -75,20 +75,26 @@
                 persist="value">
         <menupopup id="addressbookList-menupopup" class="addrbooksPopup"/>
       </menulist>
     </hbox>
 
     <separator class="thin"/>
 
     <vbox>
-      <label value="&searchInput.label;" accesskey="&searchInput.accesskey;"
+      <label value="&searchInput.label;"
+             accesskey="&searchInput.accesskey;"
              control="peopleSearchInput"/>
-      <textbox id="peopleSearchInput" flex="1" type="search" timeout="800"
-               placeholder="&SearchNameOrEmail.label;" clickSelectsAll="true"
+      <textbox type="search"
+               id="peopleSearchInput"
+               class="searchBox"
+               flex="1"
+               timeout="800"
+               placeholder="&SearchNameOrEmail.label;"
+               clickSelectsAll="true"
                oncommand="onEnterInSearchBar();"/>
     </vbox>
 
     <separator class="thin"/>
 
     <tree id="abResultsTree" flex="1" context="cardProperties" class="plain" sortCol="GeneratedName" persist="sortCol"
           onclick="contactsListOnClick(event);"
           onselect="this.view.selectionChanged(); document.commandDispatcher.updateCommands('addrbook-select');"
--- a/mail/themes/windows/mail/addrbook/abContactsPanel.css
+++ b/mail/themes/windows/mail/addrbook/abContactsPanel.css
@@ -11,16 +11,20 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #abContactsPanel {
   -moz-appearance: toolbox;
   background-color: -moz-Dialog;
 }
 
+#peopleSearchInput {
+  min-height: 24px;
+}
+
 #results_box {
   background-color: transparent;
 }
 
 @media not all and (-moz-os-version: windows-xp) {
   #abResultsTree {
     -moz-border-end: none;
     border-bottom: 1px solid #A9B1B8;
--- a/mail/themes/windows/mail/searchBox.css
+++ b/mail/themes/windows/mail/searchBox.css
@@ -158,16 +158,17 @@
   #view-task-edit-field:hover,
   #unifinder-task-edit-field:hover {
     border-color: hsl(0, 0%, 80%);
   }
 
   .searchBox[focused],
   #view-task-edit-field[focused],
   #unifinder-task-edit-field[focused] {
+    border-color: Highlight;
     box-shadow: 0 0 0 1px Highlight inset;
   }
 }
 
 /* special treatment because this boxes are on the main toolbars */
 #searchInput,
 #IMSearchInput,
 #peopleSearchInput,