1 files changed, 60 insertions, 102 deletions

diff --git a/arc-firefox-theme/chrome/browser/aboutNetError.css b/arc-firefox-theme/chrome/browser/aboutNetError.css
index 8c4a34f..627c69e 100644
--- a/arc-firefox-theme/chrome/browser/aboutNetError.css
+++ b/arc-firefox-theme/chrome/browser/aboutNetError.css
@@ -2,84 +2,28 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://global/skin/in-content/common.css");
+@import url("chrome://browser/skin/error-pages.css");
 
 body {
-  display: flex;
-  box-sizing: border-box;
-  min-height: 100vh;
-  padding: 0 48px;
-  align-items: center;
-  justify-content: center;
-}
-
-ul, ol {
-  margin: 0;
-  padding: 0;
-  -moz-margin-start: 1em;
-}
-
-ul > li, ol > li {
-  margin-bottom: .5em;
-}
-
-ul {
-  list-style: disc;
-}
-
-#errorPageContainer {
-  position: relative;
-  min-width: 320px;
-  max-width: 512px;
-}
-
-#advancedPanelContainer {
-  position: absolute;
-  padding-bottom: 24px;
-  width: 100%;
-}
-
-#errorTitle {
-  background: url("chrome://global/skin/icons/info.svg") left 0 no-repeat;
-  background-size: 3em;
-  -moz-margin-start: -5em;
-  -moz-padding-start: 5em;
+  background-image: linear-gradient(-45deg, #eeeeee,     #eeeeee 33%,
+                                            #fbfbfb 33%, #fbfbfb 66%,
+                                            #eeeeee 66%, #eeeeee);
 }
 
-#errorTitleText {
-  border-bottom: 1px solid #C1C1C1;
-  padding-bottom: 0.4em;
+body.certerror {
+  background-image: linear-gradient(-45deg, #f0d000,     #f0d000 33%,
+                                            #fedc00 33%, #fedc00 66%,
+                                            #f0d000 66%, #f0d000);
 }
 
-#errorTitleText:-moz-dir(rtl) {
-  background-position: right 0;
-}
-
-#errorTitle[sslv3=true],
-#errorTitle[weakCrypto=true] {
+body.certerror .title {
   background-image: url("cert-error.svg");
 }
 
-#errorTryAgain {
-  margin-top: 1.2em;
-  min-width: 150px
-}
-
 #errorContainer {
   display: none;
 }
 
-@media (max-width: 675px) {
-  #errorTitle,
-  #errorTitle[sslv3=true],
-  #errorTitle[weakCrypto=true] {
-    padding-top: 0;
-    background-image: none;
-    -moz-padding-start: 0;
-    -moz-margin-start: 0;
-  }
-}
-
 /* Pressing the retry button will cause the cursor to flicker from a pointer to
  * not-allowed. Override the disabled cursor behaviour since we will never show
  * the button disabled as the initial state. */
@@ -91,66 +35,50 @@ button:disabled {
   display: none;
 }
 
-#buttonContainer {
+#certErrorButtonContainer {
   display: none;
-  flex-flow: row wrap;
 }
 
-#buttonSpacer {
-  flex: 1;
+body.certerror #certErrorButtonContainer {
+  display: flex;
 }
 
-#returnButton {
-  background-color: var(--in-content-primary-button-background);
-  border: none;
-  color: var(--in-content-selected-text);
-  min-width: 250px;
-  margin-inline-start: 0;
+body.certerror #netErrorButtonContainer {
+  display: none;
 }
 
-#returnButton:hover {
-  background-color: var(--in-content-primary-button-background-hover) !important;
+#errorTryAgain {
+  margin-top: 1.2em;
+  min-width: 150px;
 }
 
-#returnButton:hover:active {
-  background-color: var(--in-content-primary-button-background-active) !important;
+#returnButton {
+  min-width: 250px;
 }
 
 #advancedButton {
   display: none;
-  min-width: 150px;
 }
 
-#certificateErrorReporting,
-#reportSentMessage {
-  display: none;
+body.certerror #advancedButton {
+  display: block;
 }
 
-div#weakCryptoAdvanced {
+#certificateErrorReporting {
   display: none;
-  float: right;
-  /* Align with the "Try Again" button */
-  margin-top: 24px;
-  -moz-margin-end: 24px;
-}
-
-div#weakCryptoAdvanced a {
-  text-decoration: none;
 }
 
-div#weakCryptoAdvanced a:hover {
-  text-decoration: underline;
+.container {
+  position: relative;
 }
 
-span.downArrow {
-  display: inline-block;
-  vertical-align: middle;
-  font-size: 0.6em;
-  -moz-margin-start: 0.5em;
-  transform: scaleY(0.7);
+#advancedPanelContainer {
+  position: absolute;
+  padding: 24px 0;
+  width: 100%;
 }
 
-div#weakCryptoAdvancedPanel {
+.advanced-panel {
   /* Hidden until the link is clicked */
   display: none;
   background-color: white;
@@ -180,8 +108,38 @@ span#hostname {
   cursor: pointer;
 }
 
-#errorCode {
+#errorCode:not([href]) {
   color: var(--in-content-page-color);
   cursor: text;
   text-decoration: none;
 }
+
+#errorCode[href] {
+  white-space: nowrap;
+}
+
+#badCertTechnicalInfo {
+  overflow: auto;
+  white-space: pre-wrap;
+}
+
+#certificateErrorReporting {
+  display: none;
+}
+
+#certificateErrorDebugInformation {
+  display: none;
+  background-color: var(--in-content-box-background-hover) !important;
+  border-top: 1px solid var(--in-content-border-color);
+  position: absolute;
+  left: 0%;
+  top: 100%;
+  width: 65%;
+  padding: 1em 17.5%;
+}
+
+#certificateErrorText {
+  font-family: monospace;
+  white-space: pre-wrap;
+  padding: 1em 0;
+}