Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Side by Side Diff: chrome/renderer/resources/neterror.css

Issue 137623011: Switch to using the new Link Doctor API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Remove bonus line from a merge conflict Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* Copyright 2013 The Chromium Authors. All rights reserved. 1 /* Copyright 2013 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. */ 3 * found in the LICENSE file. */
4 4
5 body { 5 body {
6 background-color: #E6E6E6; 6 background-color: #E6E6E6;
7 font-family: Helvetica, Arial, sans-serif; 7 font-family: Helvetica, Arial, sans-serif;
8 font-size: 10pt; 8 font-size: 10pt;
9 margin: 50px 40px 20px 40px; 9 margin: 50px 40px 20px 40px;
10 } 10 }
(...skipping 28 matching lines...) Expand all
39 39
40 #diagnose-button { 40 #diagnose-button {
41 margin-top: 20px; 41 margin-top: 20px;
42 margin-bottom: 10px; 42 margin-bottom: 10px;
43 -webkit-margin-start: 0px; 43 -webkit-margin-start: 0px;
44 } 44 }
45 45
46 #content-top #buttons, 46 #content-top #buttons,
47 #content-top h1 { 47 #content-top h1 {
48 color: #666; 48 color: #666;
49 margin: 10px 0px 25px 0px; 49 margin: 10px 0px 30px 0px;
50 font-weight: normal; 50 font-weight: normal;
51 font-size: 1.5em; 51 font-size: 1.5em;
52 text-align: center; 52 text-align: center;
53 } 53 }
54 54
55 h2 { 55 h2 {
56 color: #666; 56 color: #666;
57 font-size: 1.2em; 57 font-size: 1.2em;
58 font-weight: normal; 58 font-weight: normal;
59 margin: 10px 0; 59 margin: 10px 0;
(...skipping 18 matching lines...) Expand all
78 url('../../app/theme/default_200_percent/common/error_network_generic.png' ) 2x); 78 url('../../app/theme/default_200_percent/common/error_network_generic.png' ) 2x);
79 } 79 }
80 80
81 .icon-offline { 81 .icon-offline {
82 content: -webkit-image-set( 82 content: -webkit-image-set(
83 url('../../app/theme/default_100_percent/common/error_network_offline.png' ) 1x, 83 url('../../app/theme/default_100_percent/common/error_network_offline.png' ) 1x,
84 url('../../app/theme/default_200_percent/common/error_network_offline.png' ) 2x); 84 url('../../app/theme/default_200_percent/common/error_network_offline.png' ) 2x);
85 } 85 }
86 86
87 #content-top { 87 #content-top {
88 margin: 20px 20px 20px 25px; 88 margin: 20px;
89 } 89 }
90 90
91 #help-box-outer { 91 #help-box-outer {
92 overflow: hidden; 92 overflow: hidden;
93 -webkit-transition: height ease-in 218ms; 93 -webkit-transition: height ease-in 218ms;
94 } 94 }
95 95
96 #help-box-inner { 96 #help-box-inner {
97 background-color: #f9f9f9; 97 background-color: #f9f9f9;
98 border-top: 1px solid #EEE; 98 border-top: 1px solid #EEE;
99 color: #444; 99 color: #444;
100 padding: 25px 20px; 100 padding: 20px;
101 text-align: start; 101 text-align: start;
102 } 102 }
103 103
104 #suggestions { 104 #suggestion {
105 margin-top: 15px; 105 margin-top: 15px;
106 } 106 }
107 107
108 #short-suggestion {
109 margin-top: 5px;
110 }
111
108 #sub-frame-error-details { 112 #sub-frame-error-details {
109 color: #8F8F8F; 113 color: #8F8F8F;
110 <if expr="not is_android and not is_ios"> 114 <if expr="not is_android and not is_ios">
111 /* Not done on mobile for performance reasons. */ 115 /* Not done on mobile for performance reasons. */
112 text-shadow: 0 1px 0 rgba(255,255,255,0.3); 116 text-shadow: 0 1px 0 rgba(255,255,255,0.3);
113 </if> 117 </if>
114 } 118 }
115 119
116 [jscontent=failedUrl] { 120 [jscontent=failedUrl] {
117 overflow-wrap: break-word; 121 overflow-wrap: break-word;
118 } 122 }
119 123
120 button { 124 button {
121 border: 1px solid rgba(0, 0, 0, 0.25); 125 border: 1px solid rgba(0, 0, 0, 0.25);
122 border-radius: 2px; 126 border-radius: 2px;
123 color: #444; 127 color: #444;
124 margin: 0px 5px;
125 min-height: 29px;
126 min-width: 65px;
127 -webkit-user-select: none; 128 -webkit-user-select: none;
128 padding: 8px 13px;
129 <if expr="not is_android"> 129 <if expr="not is_android">
130 /* iOS does not support linear-gradient without a prefix. */ 130 /* iOS does not support linear-gradient without a prefix. */
131 background-image: -webkit-linear-gradient(#ededed, #ededed 38%, #dedede); 131 background-image: -webkit-linear-gradient(#ededed, #ededed 38%, #dedede);
132 text-shadow: 0 1px 0 rgb(240, 240, 240); 132 text-shadow: 0 1px 0 rgb(240, 240, 240);
133 </if> 133 </if>
134 <if expr="is_android"> 134 <if expr="is_android">
135 /* Android uses flat background colors. */ 135 /* Android uses flat background colors. */
136 background-color: #ededed; 136 background-color: #ededed;
137 font-weight: bold; 137 font-weight: bold;
138 </if> 138 </if>
(...skipping 24 matching lines...) Expand all
163 background-image: -webkit-linear-gradient(#e7e7e7, #e7e7e7 38%, #d7d7d7); 163 background-image: -webkit-linear-gradient(#e7e7e7, #e7e7e7 38%, #d7d7d7);
164 </if> 164 </if>
165 <if expr="is_android"> 165 <if expr="is_android">
166 background-color: #e7e7e7; 166 background-color: #e7e7e7;
167 </if> 167 </if>
168 <if expr="not is_android and not is_ios"> 168 <if expr="not is_android and not is_ios">
169 box-shadow: none; 169 box-shadow: none;
170 </if> 170 </if>
171 } 171 }
172 172
173 #reload-button { 173 .text-button {
174 margin: 0px 5px;
175 min-height: 29px;
176 min-width: 65px;
177 padding: 7px 13px;
178 }
179
180 .blue-button {
174 color: #fff; 181 color: #fff;
175 <if expr="not is_android"> 182 <if expr="not is_android">
176 background-image: -webkit-linear-gradient(#5d9aff, #5d9aff 38%, #5891f0); 183 background-image: -webkit-linear-gradient(#5d9aff, #5d9aff 38%, #5891f0);
177 border: 1px solid rgba(45, 102, 195, 1); 184 border: 1px solid rgba(45, 102, 195, 1);
178 text-shadow: 0 1px 0 rgba(0,0,0,0.5); 185 text-shadow: 0 1px 0 rgba(0,0,0,0.5);
179 </if> 186 </if>
180 <if expr="is_android"> 187 <if expr="is_android">
181 background-color: rgb(39, 180, 231); 188 background-color: rgb(39, 180, 231);
182 border: 1px solid rgb(0, 152, 206); 189 border: 1px solid rgb(0, 152, 206);
183 </if> 190 </if>
184 <if expr="not is_android and not is_ios"> 191 <if expr="not is_android and not is_ios">
185 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 1px 2px rgba(255, 255, 255, 0 .2); 192 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 1px 2px rgba(255, 255, 255, 0 .2);
186 </if> 193 </if>
187 } 194 }
188 195
189 #reload-button:hover { 196 .blue-button:hover {
190 <if expr="not is_android"> 197 <if expr="not is_android">
191 background-image: -webkit-linear-gradient(#659efd, #659efd 38%, #6097f1); 198 background-image: -webkit-linear-gradient(#659efd, #659efd 38%, #6097f1);
192 border: 1px solid rgba(45, 102, 195, 1); 199 border: 1px solid rgba(45, 102, 195, 1);
193 </if> 200 </if>
194 <if expr="not is_android and not is_ios"> 201 <if expr="not is_android and not is_ios">
195 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25), inset 0 1px 2px rgba(255, 255, 255, 0 .2); 202 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25), inset 0 1px 2px rgba(255, 255, 255, 0 .2);
196 </if> 203 </if>
197 } 204 }
198 205
199 #reload-button:active { 206 .blue-button:active {
200 <if expr="not is_android"> 207 <if expr="not is_android">
201 background-image: -webkit-linear-gradient(#6095ed, #6095ed 38%, #6095ed); 208 background-image: -webkit-linear-gradient(#6095ed, #6095ed 38%, #6095ed);
202 border: 1px solid rgb(38, 84, 160); 209 border: 1px solid rgb(38, 84, 160);
203 </if> 210 </if>
204 <if expr="is_android"> 211 <if expr="is_android">
205 background-color: rgb(0, 152, 206); 212 background-color: rgb(0, 152, 206);
206 </if> 213 </if>
207 <if expr="not is_android and not is_ios"> 214 <if expr="not is_android and not is_ios">
208 box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); 215 box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
209 </if> 216 </if>
210 } 217 }
211 218
219 #search-container {
220 /* Prevents a space between controls. */
221 display: flex;
222 margin-top: 20px;
223 }
224
225 #search-box {
226 border: 1px solid #cdcdcd;
227 flex-grow: 1;
228 font-size: 16px;
229 height: 26px;
230 margin-right: 0;
231 padding: 1px 9px;
232 }
233
234 #search-box:focus {
235 border: 1px solid #5d9aff;
236 outline: none;
237 }
238
239 #search-button {
240 border: none;
241 border-top-left-radius: 0;
242 border-bottom-left-radius: 0;
243 box-shadow: none;
244 display: flex;
245 height: 30px;
246 margin: 0;
247 width: 60px;
248 padding: 0;
249 }
250
251 #search-image {
252 content:
253 -webkit-image-set(
254 url('../../app/theme/default_100_percent/common/omnibox_search_button_ loupe.png') 1x,
255 url('../../app/theme/default_200_percent/common/omnibox_search_button_ loupe.png') 2x);
256 margin: auto;
257 }
258
212 .hidden { 259 .hidden {
213 display: none; 260 display: none;
214 } 261 }
215 262
216 .suggestions { 263 .suggestions {
217 margin-top: 18px; 264 margin-top: 18px;
218 } 265 }
219 266
220 .suggestion-header { 267 .suggestion-header {
221 font-weight: bold; 268 font-weight: bold;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 visibility: visible; 342 visibility: visible;
296 } 343 }
297 344
298 /* If the iframe is too small, always hide the error code. */ 345 /* If the iframe is too small, always hide the error code. */
299 /* TODO(mmenke): See if overflow: no-display works better, once supported. */ 346 /* TODO(mmenke): See if overflow: no-display works better, once supported. */
300 @media (max-width: 200px), (max-height: 95px) { 347 @media (max-width: 200px), (max-height: 95px) {
301 #sub-frame-error-details { 348 #sub-frame-error-details {
302 display: none; 349 display: none;
303 } 350 }
304 } 351 }
OLDNEW
« no previous file with comments | « chrome/renderer/net/net_error_helper_core_unittest.cc ('k') | chrome/renderer/resources/neterror.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698