From 55a9d343e566ba70a0e4d076abc0cdd4a8b9a9ec Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Thu, 29 Oct 2015 12:12:42 +0100
Subject: [PATCH] Backed out changeset cad376d2e71f (bug 1218908) for blocking
 m-c to fx-team merge with a conflict

---
 browser/components/preferences/in-content/content.js         | 4 ----
 browser/components/preferences/in-content/content.xul        | 9 +++------
 browser/locales/en-US/chrome/browser/preferences/content.dtd | 1 -
 browser/themes/shared/incontentprefs/preferences.inc.css     | 4 ----
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/browser/components/preferences/in-content/content.js b/browser/components/preferences/in-content/content.js
index 31f892a51006..50f33edd86c2 100644
--- a/browser/components/preferences/in-content/content.js
+++ b/browser/components/preferences/in-content/content.js
@@ -74,10 +74,6 @@ var gContentPane = {
     setEventListener("notificationsDoNotDisturb", "command",
       gContentPane.toggleDoNotDisturbNotifications);
 
-    let notificationInfoURL = Services.urlFormatter.formatURLPref("browser.push.warning.infoURL");
-    document.getElementById("notificationsPolicyLearnMore").setAttribute("href",
-                                                                         notificationInfoURL);
-
     let drmInfoURL =
       Services.urlFormatter.formatURLPref("app.support.baseURL") + "drm-content";
     document.getElementById("playDRMContentLink").setAttribute("href", drmInfoURL);
diff --git a/browser/components/preferences/in-content/content.xul b/browser/components/preferences/in-content/content.xul
index 05f0d0570b32..5fe1364e18d6 100644
--- a/browser/components/preferences/in-content/content.xul
+++ b/browser/components/preferences/in-content/content.xul
@@ -68,13 +68,10 @@
       <column/>
     </columns>
     <rows>
-      <row id="notificationsPolicyRow" align="center">
-        <hbox align="start">
+      <row id="notificationsPolicyRow">
+        <vbox align="start">
           <label id="notificationsPolicy">&notificationsPolicyDesc.label;</label>
-          <label id="notificationsPolicyLearnMore"
-                 class="text-link"
-                 value="&notificationsPolicyLearnMore.label;"/>
-        </hbox>
+        </vbox>
         <hbox pack="end">
           <button id="notificationsPolicyButton" label="&notificationsPolicyButton.label;"
                   accesskey="&notificationsPolicyButton.accesskey;"/>
diff --git a/browser/locales/en-US/chrome/browser/preferences/content.dtd b/browser/locales/en-US/chrome/browser/preferences/content.dtd
index 626997a54cb6..ebd86967a564 100644
--- a/browser/locales/en-US/chrome/browser/preferences/content.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/content.dtd
@@ -8,7 +8,6 @@
 <!ENTITY  blockPopups.accesskey       "B">
 
 <!ENTITY  notificationsPolicy.label            "Notifications">
-<!ENTITY  notificationsPolicyLearnMore.label   "Learn more">
 <!ENTITY  notificationsPolicyDesc.label        "Choose which sites are allowed to show notifications">
 <!ENTITY  notificationsPolicyButton.accesskey  "h">
 <!ENTITY  notificationsPolicyButton.label      "Choose…">
diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css
index e8d4ee400c7e..18cfd7804967 100644
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -171,10 +171,6 @@ treecol {
   margin-right: 4px !important;
 }
 
-#notificationsPolicyLearnMore {
-  -moz-margin-start: 1.5em !important;
-}
-
 #defaultFontSizeLabel {
   /* !important needed to override common !important rule */
   -moz-margin-start: 4px !important;
-- 
2.11.4.GIT