Backed out changeset d56201330a5b (bug 1105704) for mochitest-bc failures.

browser/base/content/aboutNetError.xhtml

@@ -217,15 +217,9 @@
         }
 
         window.addEventListener("AboutNetErrorOptions", function(evt) {
-        // Pinning errors are of type nssFailure2
+        // Pinning errors are of type nssFailure2 (don't ask me why)
           if (getErrorCode() == "nssFailure2" && !errTitle.hasAttribute("sslv3")) {
-            let learnMoreLink = document.getElementById("learnMoreLink");
-            // nssFailure2 also gets us other non-overrideable errors. Choose
-            // a "learn more" link based on description:
-            if (getDescription().contains("mozilla_pkix_error_key_pinning_failure")) {
-              learnMoreLink.href = "https://support.mozilla.org/kb/certificate-pinning-reports";
-            }
-
+          // TODO: and the pref is set...
             var options = JSON.parse(evt.detail);
             if (options && options.enabled) {
               var checkbox = document.getElementById('automaticallyReportInFuture');
@@ -482,7 +476,8 @@
           <input type="checkbox" id="automaticallyReportInFuture" />
           <label for="automaticallyReportInFuture" id="automaticallyReportInFuture">&errorReporting.automatic;</label>
         </p>
-        <a href="https://support.mozilla.org/kb/tls-error-reports" id="learnMoreLink" target="new">&errorReporting.learnMore;</a>
+        <!-- TODO add link to relevant page on sumo -->
+        <a href="https://support.mozilla.org/kb/certificate-pinning-reports" target="new">&errorReporting.learnMore;</a>
         <span id="reportingState">
           <button id="reportCertificateError">&errorReporting.report;</button>
           <button id="reportCertificateErrorRetry">&errorReporting.tryAgain;</button>

browser/themes/shared/aboutNetError.css

@@ -28,7 +28,6 @@ ul {
 }
 
 #errorPageContainer {
-  position: relative;
   min-width: 320px;
   max-width: 512px;
 }
@@ -81,6 +80,11 @@ div#certificateErrorReporting {
   margin-right:24px;
 }
 
+div#certificateErrorReporting a,
+div#certificateErrorReportingPanel a {
+  color: #0095DD;
+}
+
 div#certificateErrorReporting a {
   text-decoration: none;
 }
@@ -90,11 +94,7 @@ div#certificateErrorReporting a:hover {
 }
 
 span.downArrow {
-  display: inline-block;
-  vertical-align: middle;
-  font-size: 0.6em;
-  -moz-margin-start: 0.5em;
-  transform: scaleY(0.7);
+  font-size: 0.9em;
 }
 
 div#certificateErrorReportingPanel {
@@ -106,18 +106,11 @@ div#certificateErrorReportingPanel {
    * makes the overall div look uneven */
   padding: 0 12px 12px 12px;
   box-shadow: 0 0 4px #ddd;
-  font-size: 0.9em;
-  position: absolute;
+  position: relative;
   width: 75%;
-  margin-top: 10px;
-}
-
-div#certificateErrorReportingPanel:-moz-dir(ltr) {
   left: 34%;
-}
-
-div#certificateErrorReportingPanel:-moz-dir(rtl) {
-  right: 34%;
+  font-size: 0.9em;
+  top: 8px;
 }
 
 span#hostname {