From 8ec918833d504da58b8b734a5da76e4f88d880e5 Mon Sep 17 00:00:00 2001
From: Sebastian Hengst <archaeopteryx@coole-files.de>
Date: Tue, 24 Nov 2015 20:06:21 +0100
Subject: [PATCH] Bug 1227647 - Remove UI code for legacy sync migration.
 r=markh

---
 .../components/preferences/in-content/sync.js |  4 --
 .../themes/linux/preferences/preferences.css  | 21 -------
 .../themes/osx/preferences/preferences.css    | 21 -------
 .../shared/incontentprefs/preferences.inc.css | 62 -------------------
 .../windows/preferences/preferences.css       | 21 -------
 5 files changed, 129 deletions(-)

diff --git a/browser/components/preferences/in-content/sync.js b/browser/components/preferences/in-content/sync.js
index b36c8e927dd..425e88adce4 100644
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@@ -185,10 +185,6 @@ var gSyncPane = {
     document.getElementById("syncStatusMessage").removeAttribute("message-type");
     document.getElementById("syncStatusMessageTitle").textContent = "";
     document.getElementById("syncStatusMessageDescription").textContent = "";
-    let learnMoreLink = document.getElementById("learnMoreLink");
-    if (learnMoreLink) {
-      learnMoreLink.parentNode.removeChild(learnMoreLink);
-    }
   },
 
   _setupEventListeners: function() {
diff --git a/browser/themes/linux/preferences/preferences.css b/browser/themes/linux/preferences/preferences.css
index d79e77f3355..95820e2c5b7 100644
--- a/browser/themes/linux/preferences/preferences.css
+++ b/browser/themes/linux/preferences/preferences.css
@@ -184,24 +184,3 @@ label.small {
 #noFxaAccount > label:first-child {
   margin-bottom: 0.6em;
 }
-
-/**
- * Sync migration
- */
-#sync-migration {
-  border: 1px solid rgba(0, 0, 0, 0.32);
-  background-color: InfoBackground;
-  color: InfoText;
-  text-shadow: none;
-  margin: 5px 0 0 0;
-  animation: fadein 3000ms;
-}
-
-#sync-migration description {
-  margin: 8px;
-}
-
-@keyframes fadein {
-  from { opacity: 0; }
-  to   { opacity: 1; }
-}
diff --git a/browser/themes/osx/preferences/preferences.css b/browser/themes/osx/preferences/preferences.css
index 302338023ca..57a295938f1 100644
--- a/browser/themes/osx/preferences/preferences.css
+++ b/browser/themes/osx/preferences/preferences.css
@@ -243,24 +243,3 @@ html|a.inline-link:-moz-focusring {
 #noFxaAccount > label:first-child {
   margin-bottom: 0.6em;
 }
-
-/**
- * Sync migration
- */
-#sync-migration {
-  border: 1px solid rgba(0, 0, 0, 0.32);
-  background-color: InfoBackground;
-  color: InfoText;
-  text-shadow: none;
-  margin: 5px 0 0 0;
-  animation: fadein 3000ms;
-}
-
-#sync-migration description {
-  margin: 8px;
-}
-
-@keyframes fadein {
-  from { opacity: 0; }
-  to   { opacity: 1; }
-}
diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css
index 325e0284cba..16321bbf0f0 100644
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -372,28 +372,6 @@ description > html|a {
   min-width: 30ch;
 }
 
-/**
- * Sync migration
- */
-#sync-migrate-upgrade-description {
-  /* description elts need a min-width to wrap correctly - bug 630864? */
-  min-width: 100px
-}
-
-#sync-migration {
-  border: 1px solid rgba(0, 0, 0, 0.32);
-  background-color: InfoBackground;
-  color: InfoText;
-  text-shadow: none;
-  margin: 5px 0 0 0;
-  animation: fadein 3000ms;
-}
-
-@keyframes fadein {
-  from { opacity: 0; }
-  to   { opacity: 1; }
-}
-
 /**
  * Sync
  */
@@ -467,46 +445,6 @@ description > html|a {
   background-color: #FF9500;
 }
 
-#sync-migration-buttons-deck {
-  visibility: collapse;
-}
-
-#learnMoreLink {
-  margin: 0;
-  color: #FBFBFB;
-  text-decoration: underline;
-}
-
-#syncStatusMessage[message-type="migration"] #sync-migration-buttons-deck {
-  visibility: visible;
-}
-
-#sync-migration-buttons-deck {
-  margin-top: 20px;
-}
-
-#sync-migration-buttons-deck button {
-  margin: 0 10px 0 0;
-  border: 0;
-  border-radius: 2px;
-}
-
-#sync-migrate-upgrade,
-#sync-migrate-resend {
-  background-color: #0095DD;
-  color: #FBFBFB;
-}
-
-#sync-migrate-upgrade:hover,
-#sync-migrate-resend:hover {
-  background-color: #008ACB;
-}
-
-#sync-migrate-upgrade:hover:active,
-#sync-migrate-resend:hover:active {
-  background-color: #006B9D;
-}
-
 #syncStatusMessageWrapper {
   -moz-box-flex: 1;
   padding-right: 5px;
diff --git a/browser/themes/windows/preferences/preferences.css b/browser/themes/windows/preferences/preferences.css
index d4dbf89c272..7230b68a7e1 100644
--- a/browser/themes/windows/preferences/preferences.css
+++ b/browser/themes/windows/preferences/preferences.css
@@ -173,24 +173,3 @@ label.small {
 #noFxaAccount > label:first-child {
   margin-bottom: 0.6em;
 }
-
-/**
- * Sync migration
- */
-#sync-migration {
-  border: 1px solid rgba(0, 0, 0, 0.32);
-  background-color: InfoBackground;
-  color: InfoText;
-  text-shadow: none;
-  margin: 5px 0 0 0;
-  animation: fadein 3000ms;
-}
-
-#sync-migration description {
-  margin: 8px;
-}
-
-@keyframes fadein {
-  from { opacity: 0; }
-  to   { opacity: 1; }
-}