Bug 1434078 - Devices actions links touch-ups. r=markh

MozReview-Commit-ID: I0q915ku8o8

--HG--
extra : rebase_source : 1e3b54262c8eba4f30732eba41affaf63903809e

browser/components/preferences/in-content/sync.js

@@ -329,10 +329,11 @@ var gSyncPane = {
     fxAccounts.promiseAccountsManageURI(this._getEntryPoint()).then(accountsManageURI => {
       document.getElementById("verifiedManage").setAttribute("href", accountsManageURI);
     });
+    let isUnverified = state.status == UIState.STATUS_NOT_VERIFIED;
     // The mobile promo links - which one is shown depends on the number of devices.
     let isMultiDevice = Weave.Service.clientsEngine.stats.numClients > 1;
-    document.getElementById("mobilePromo-singledevice").hidden = isMultiDevice;
-    document.getElementById("mobilePromo-multidevice").hidden = !isMultiDevice;
+    document.getElementById("mobilePromo-singledevice").hidden = isUnverified || isMultiDevice;
+    document.getElementById("mobilePromo-multidevice").hidden = isUnverified || !isMultiDevice;
   },
 
   _getEntryPoint() {

browser/components/preferences/in-content/sync.xul

@@ -205,10 +205,12 @@
                 hidden="true"/>
       </hbox>
     </groupbox>
-    <label id="mobilePromo-singledevice"
-           class="text-link fxaMobilePromo">&mobilepromo.singledevice;</label>
-    <label id="mobilePromo-multidevice"
-           class="text-link fxaMobilePromo">&mobilepromo.multidevice;</label>
+    <vbox align="start">
+      <label id="mobilePromo-singledevice"
+             class="text-link fxaMobilePromo">&mobilepromo.singledevice;</label>
+      <label id="mobilePromo-multidevice"
+             class="text-link fxaMobilePromo">&mobilepromo.multidevice;</label>
+    </vbox>
     <vbox id="tosPP-small" align="start">
       <label id="tosPP-small-ToS" class="text-link">
         &prefs.tosLink.label;

browser/themes/shared/incontentprefs/preferences.inc.css

@@ -548,6 +548,10 @@ button > hbox > label {
   margin-bottom: 4px;
 }
 
+#tosPP-small {
+  margin-top: 32px;
+}
+
 #tosPP-small-ToS {
   margin-bottom: 14px;
 }
@@ -608,7 +612,7 @@ button > hbox > label {
 }
 
 .fxaMobilePromo {
-  margin: 2px 0 32px 0 !important;
+  margin-top: 2px !important;
 }
 
 .androidLink {