Bug 1480886 - Move the autofill country warning message out of the <form>. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D4164

--HG--
extra : rebase_source : bcf2f541297b653a7c30badd74de56a57ee93806

browser/components/payments/res/containers/address-form.css

@@ -2,11 +2,6 @@
  * 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/. */
 
-/* Hide the message about autofill availability since it's not relevant */
-#country-warning-message {
-  display: none;
-}
-
 .error-text:not(:empty) {
   color: #fff;
   background-color: #d70022;

browser/extensions/formautofill/content/editAddress.xhtml

@@ -57,15 +57,12 @@
         <input id="postal-code" type="text" required="required"/>
         <span class="label-text"/>
       </label>
-      <div id="country-container">
-        <label id="country-label">
-          <select id="country" required="required">
-            <option/>
-          </select>
-          <span data-localization="country" class="label-text"/>
-        </label>
-        <p id="country-warning-message" data-localization="countryWarningMessage2"/>
-      </div>
+      <label id="country-container">
+        <select id="country" required="required">
+          <option/>
+        </select>
+        <span data-localization="country" class="label-text"/>
+      </label>
       <label id="tel-container">
         <input id="tel" type="tel"/>
         <span data-localization="tel" class="label-text"/>
@@ -79,6 +76,7 @@
   <div id="controls-container">
     <button id="cancel" data-localization="cancelBtnLabel"/>
     <button id="save" disabled="disabled" data-localization="saveBtnLabel"/>
+    <span id="country-warning-message" data-localization="countryWarningMessage2"/>
   </div>
   <script type="application/javascript"><![CDATA[
     "use strict";

browser/extensions/formautofill/skin/shared/editAddress.css

@@ -18,8 +18,7 @@
 #additional-name-container,
 #address-level1-container,
 #postal-code-container,
-#country-label,
-#country-warning-message,
+#country-container,
 #family-name-container,
 #organization-container,
 #address-level2-container,
@@ -95,10 +94,8 @@
 
 /* End name field rules */
 
-
 #name-container,
 #street-address-container,
-#country-container,
 #email-container {
   flex: 0 1 100%;
 }
@@ -116,3 +113,7 @@
   color: #737373;
   padding-inline-start: 1em;
 }
+
+:root:not([subdialog]) #country-warning-message {
+  display: none;
+}