Merge branch 'firefox-44-beta'

1 files changed, 16 insertions, 8 deletions

diff --git a/arc-firefox-theme/chrome/browser/aboutNetError.css b/arc-firefox-theme/chrome/browser/aboutNetError.css
index ff80788..7a4eca3 100644
--- a/arc-firefox-theme/chrome/browser/aboutNetError.css
+++ b/arc-firefox-theme/chrome/browser/aboutNetError.css
@@ -49,7 +49,8 @@ ul {
   background-position: right 0;
 }
 
-#errorTitle[sslv3=true] {
+#errorTitle[sslv3=true],
+#errorTitle[weakCrypto=true] {
   background-image: url("aboutNetError_alert.svg");
 }
 
@@ -78,7 +79,8 @@ button:disabled {
   cursor: pointer;
 }
 
-div#certificateErrorReporting {
+div#certificateErrorReporting,
+div#weakCryptoAdvanced {
   display: none;
   float: right;
   /* Align with the "Try Again" button */
@@ -86,11 +88,13 @@ div#certificateErrorReporting {
   -moz-margin-end: 24px;
 }
 
-div#certificateErrorReporting a {
+div#certificateErrorReporting a,
+div#weakCryptoAdvanced a {
   text-decoration: none;
 }
 
-div#certificateErrorReporting a:hover {
+div#certificateErrorReporting a:hover,
+div#weakCryptoAdvanced a:hover {
   text-decoration: underline;
 }
 
@@ -102,7 +106,8 @@ span.downArrow {
   transform: scaleY(0.7);
 }
 
-div#certificateErrorReportingPanel {
+div#certificateErrorReportingPanel,
+div#weakCryptoAdvancedPanel {
   /* Hidden until the link is clicked */
   display: none;
   background-color: white;
@@ -117,15 +122,18 @@ div#certificateErrorReportingPanel {
   margin-top: 10px;
 }
 
-div#certificateErrorReportingPanel:-moz-dir(ltr) {
+div#certificateErrorReportingPanel:-moz-dir(ltr),
+div#weakCryptoAdvancedPanel:-moz-dir(ltr) {
   left: 34%;
 }
 
-div#certificateErrorReportingPanel:-moz-dir(rtl) {
+div#certificateErrorReportingPanel:-moz-dir(rtl),
+div#weakCryptoAdvancedPanel:-moz-dir(rtl) {
   right: 0;
 }
 
-#errorStatePanel {
+#errorStatePanel,
+#overrideWeakCryptoPanel {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;