Bug 1065731 - When adding a number to an existing contact, search ico…

…n does nothing

Conflicts:
	shared/pages/import/style/search.css

shared/pages/import/import.html

@@ -160,14 +160,14 @@ <h1>Service</h1>
 
       <section id="search-view" class="view" role="region">
         <form id="searchview-container" role="search" class="search">
-           <button id='done-search' type="submit" data-l10n-id="done-search">Done</button>
-           <p>
-             <label for="search-contact">
-               <input type="search" name="search" class="textfield"
-                    placeholder="Search" id="search-contact"  data-l10n-id="search-contact">
-               <button type="reset">Clear</button>
-             </label>
-           </p>
+          <p>
+            <label for="search-contact">
+              <input type="search" name="search" class="textfield"
+                   placeholder="Search" id="search-contact"  data-l10n-id="search-contact">
+              <button type="reset">Clear</button>
+            </label>
+          </p>
+          <button id='done-search' type="submit" data-l10n-id="done-search">Done</button>
         </form>
         <section id="groups-list-search">
           <ol id="search-list" class="selecting active" data-type="list">

shared/pages/import/style/import.css

@@ -176,3 +176,7 @@ li[data-uuid]{
 li[data-uuid]:last-child {
   border-bottom: none !important;
 }
+
+#done-search {
+  min-width: 8.2rem;
+}

shared/pages/import/style/search.css

@@ -115,7 +115,8 @@ form.search button[type="submit"] {
 #groups-list-search {
   position: relative;
   text-align: left;
-  overflow: auto;
+  overflow-y: auto;
+  overflow-x: hidden;
   z-index: 1;
 }
 
@@ -150,3 +151,8 @@ form.search button[type="submit"] {
 span.highlight {
   background-color: #b2f2ff;
 }
+
+#searchview-container p input::-moz-placeholder,
+#search-container p input::-moz-placeholder {
+  background: none;
+}