Reinstate the error code to main content area + bug fixes on security / network interstitials

chrome/browser/resources/security_warnings/interstitial_v2.css

Index: chrome/browser/resources/security_warnings/interstitial_v2.css
diff --git a/chrome/browser/resources/security_warnings/interstitial_v2.css b/chrome/browser/resources/security_warnings/interstitial_v2.css
index a847191b8d9ac197f4abe56a7fd247eea65b53eb..920b644e7e49d461b58c7e7556be7f2b72953162 100644
--- a/chrome/browser/resources/security_warnings/interstitial_v2.css
+++ b/chrome/browser/resources/security_warnings/interstitial_v2.css
@@ -31,9 +31,8 @@ button {
   cursor: pointer;
   float: right;
   font-size: .875em;
-  height: 36px;
-  margin: -6px 0 0;
-  padding: 8px 24px;
+  margin: 0;
+  padding: 10px 24px;
   transition: box-shadow 200ms cubic-bezier(0.4, 0, 0.2, 1);
 }
 
@@ -51,13 +50,14 @@ button:hover {
 }
 
 #debugging {
+  display: inline;
   overflow: auto;
 }
 
 .debugging-content {
   line-height: 1em;
   margin-bottom: 0;
-  margin-top: 0;
+  margin-top: 1em;
 }
 
 .debugging-title {
@@ -77,8 +77,8 @@ button:hover {
   background: inherit;
   border: 0;
   float: none;
-  margin: -6px 0 0;
-  padding: 0;
+  margin: 0;
+  padding: 10px 0;
   text-decoration: underline;
 }
 
@@ -86,16 +86,17 @@ button:hover {
   box-shadow: inherit;
 }
 
-#error-code {
-  color: black;
-  font-size: .825em;
-  opacity: .35;
+.error-code {
+  color: #777;
+  display: inline;
+  font-size: .86667em;
+  margin-top: 15px;
+  opacity: .5;
   text-transform: uppercase;
 }
 
 #error-debugging-info {
   font-size: 0.8em;
-  overflow: auto;
 }
 
 h1 {
@@ -141,6 +142,10 @@ input[type=checkbox] {
   width: 100%;
 }
 
+#main-message > p {
+  display: inline;
+}
+
 #malware-opt-in {
   font-size: .875em;
   margin-top: 39px;
@@ -178,18 +183,16 @@ input[type=checkbox] {
   box-shadow: 0 2px 3px rgba(0, 0, 0, .5);
 }
 
+.safe-browsing .error-code {
+  display: none;
+}
+
 .safe-browsing .icon {
   background-image: -webkit-image-set(
       url(images/1x/stop_sign.png) 1x,
       url(images/2x/stop_sign.png) 2x);
 }
 
-.secondary-button {
-  -webkit-margin-end: 16px;
-  background: #d9d9d9;
-  color: #696969;
-}
-
 .small-link {
   color: #696969;
   font-size: .875em;
@@ -239,7 +242,7 @@ input[type=checkbox] {
   content: '';
   height: 4px;
   left: 2px;
-  opacity: 0.3;
+  opacity: 0;
   position: absolute;
   top: 3px;
   transform: rotate(-45deg);
@@ -254,9 +257,17 @@ input[type=checkbox] {
   .interstitial-wrapper {
     padding: 0 10%;
   }
+
+  #error-debugging-info {
+    overflow: auto;
+  }
 }
 
 @media (max-height: 600px) {
+  .error-code {
+    margin-top: 10px;
+  }
+
   .interstitial-wrapper {
     margin-top: 13%;
   }
@@ -358,6 +369,10 @@ input[type=checkbox] {
     width: 100%;
   }
 
+  .error-code {
+    margin-top: 0;
+  }
+
   #details {
     box-sizing: border-box;
     height: auto;