Revert 262846, as the revert has now been merged to M35.

trunk/src/chrome/renderer/resources/neterror.css

 /* Copyright 2013 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file. */
 
 body {
   background-color: #E6E6E6;
   font-family: Helvetica, Arial, sans-serif;
   font-size: 10pt;
   margin: 50px 40px 20px 40px;
 }
@@ skipping 28 matching lines @@
 
 #diagnose-button {
   margin-top: 20px;
   margin-bottom: 10px;
   -webkit-margin-start: 0px;
 }
 
 #content-top #buttons,
 #content-top h1 {
   color: #666;
-  margin: 10px 0px 25px 0px;
+  margin: 10px 0px 30px 0px;
   font-weight: normal;
   font-size: 1.5em;
   text-align: center;
 }
 
 h2 {
   color: #666;
   font-size: 1.2em;
   font-weight: normal;
   margin: 10px 0;
@@ skipping 18 matching lines @@
       url('../../app/theme/default_200_percent/common/error_network_generic.png') 2x);
 }
 
 .icon-offline {
   content: -webkit-image-set(
       url('../../app/theme/default_100_percent/common/error_network_offline.png') 1x,
       url('../../app/theme/default_200_percent/common/error_network_offline.png') 2x);
 }
 
 #content-top {
-  margin: 20px 20px 20px 25px;
+  margin: 20px;
 }
 
 #help-box-outer {
   overflow: hidden;
   -webkit-transition: height ease-in 218ms;
 }
 
 #help-box-inner {
   background-color: #f9f9f9;
   border-top: 1px solid #EEE;
   color: #444;
-  padding: 25px 20px;
+  padding: 20px;
   text-align: start;
 }
 
-#suggestions {
+#suggestion {
   margin-top: 15px;
 }
 
+#short-suggestion {
+  margin-top: 5px;
+}
+
 #sub-frame-error-details {
   color: #8F8F8F;
 <if expr="not is_android and not is_ios">
   /* Not done on mobile for performance reasons. */
   text-shadow: 0 1px 0 rgba(255,255,255,0.3);
 </if>
 }
 
 [jscontent=failedUrl] {
   overflow-wrap: break-word;
 }
 
 button {
   border: 1px solid rgba(0, 0, 0, 0.25);
   border-radius: 2px;
   color: #444;
-  margin: 0px 5px;
-  min-height: 29px;
-  min-width: 65px;
   -webkit-user-select: none;
-  padding: 8px 13px;
 <if expr="not is_android">
   /* iOS does not support linear-gradient without a prefix. */
   background-image: -webkit-linear-gradient(#ededed, #ededed 38%, #dedede);
   text-shadow: 0 1px 0 rgb(240, 240, 240);
 </if>
 <if expr="is_android">
   /* Android uses flat background colors. */
   background-color: #ededed;
   font-weight: bold;
 </if>
@@ skipping 24 matching lines @@
   background-image: -webkit-linear-gradient(#e7e7e7, #e7e7e7 38%, #d7d7d7);
 </if>
 <if expr="is_android">
   background-color: #e7e7e7;
 </if>
 <if expr="not is_android and not is_ios">
   box-shadow: none;
 </if>
 }
 
-#reload-button {
+.text-button {
+  margin: 0px 5px;
+  min-height: 29px;
+  min-width: 65px;
+  padding: 7px 13px;
+}
+
+.blue-button {
   color: #fff;
 <if expr="not is_android">
   background-image: -webkit-linear-gradient(#5d9aff, #5d9aff 38%, #5891f0);
   border: 1px solid rgba(45, 102, 195, 1);
   text-shadow: 0 1px 0 rgba(0,0,0,0.5);
 </if>
 <if expr="is_android">
   background-color: rgb(39, 180, 231);
   border: 1px solid rgb(0, 152, 206);
 </if>
 <if expr="not is_android and not is_ios">
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 1px 2px rgba(255, 255, 255, 0.2);
 </if>
 }
 
-#reload-button:hover {
+.blue-button:hover {
   color: #fff;
 <if expr="not is_android">
   background-image: -webkit-linear-gradient(#659efd, #659efd 38%, #6097f1);
   border: 1px solid rgba(45, 102, 195, 1);
 </if>
 <if expr="not is_android and not is_ios">
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25), inset 0 1px 2px rgba(255, 255, 255, 0.2);
 </if>
 }
 
-#reload-button:active {
+.blue-button:active {
 <if expr="not is_android">
   background-image: -webkit-linear-gradient(#6095ed, #6095ed 38%, #6095ed);
   border: 1px solid rgb(38, 84, 160);
 </if>
 <if expr="is_android">
   background-color: rgb(0, 152, 206);
 </if>
 <if expr="not is_android and not is_ios">
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
 </if>
 }
 
+#search-container {
+  /* Prevents a space between controls. */
+  display: flex;
+  margin-top: 20px;
+}
+
+#search-box {
+  border: 1px solid #cdcdcd;
+  flex-grow: 1;
+  font-size: 16px;
+  height: 26px;
+  margin-right: 0;
+  padding: 1px 9px;
+}
+
+#search-box:focus {
+  border: 1px solid #5d9aff;
+  outline: none;
+}
+
+#search-button {
+  border: none;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  box-shadow: none;
+  display: flex;
+  height: 30px;
+  margin: 0;
+  width: 60px;
+  padding: 0;
+}
+
+#search-image {
+  content:
+      -webkit-image-set(
+          url('../../app/theme/default_100_percent/common/omnibox_search_button_loupe.png') 1x,
+          url('../../app/theme/default_200_percent/common/omnibox_search_button_loupe.png') 2x);
+  margin: auto;
+}
+
 .hidden {
   display: none;
 }
 
 .suggestions {
   margin-top: 18px;
 }
 
 .suggestion-header {
   font-weight: bold;
@@ skipping 73 matching lines @@
   visibility: visible;
 }
 
 /* If the iframe is too small, always hide the error code. */
 /* TODO(mmenke): See if overflow: no-display works better, once supported. */
 @media (max-width: 200px), (max-height: 95px) {
   #sub-frame-error-details {
     display: none;
   }
 }