OLD | NEW |
---|---|
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 /******************************************************************************* | |
6 * | |
7 * Note: This is also used by a file in chrome/browser/resources/ssl. When | |
8 * updating this file, make sure nothing in that directory regresses. | |
9 * | |
10 ******************************************************************************/ | |
11 | |
12 body { | 5 body { |
13 background-color: #E6E6E6; | 6 background-color: #E6E6E6; |
14 font-family: Helvetica, Arial, sans-serif; | 7 font-family: Helvetica, Arial, sans-serif; |
15 font-size: 10pt; | 8 font-size: 10pt; |
16 margin: 50px 40px 20px 40px; | 9 margin: 50px 40px 20px 40px; |
17 } | 10 } |
18 | 11 |
19 #main-frame-error { | 12 #main-frame-error { |
20 margin: auto; | 13 margin: auto; |
21 max-width: 540px; | 14 max-width: 540px; |
(...skipping 16 matching lines...) Expand all Loading... | |
38 border-bottom: 1px solid #888; | 31 border-bottom: 1px solid #888; |
39 border-radius: 3px; | 32 border-radius: 3px; |
40 color: black; | 33 color: black; |
41 <if expr="not is_android and not is_ios"> | 34 <if expr="not is_android and not is_ios"> |
42 /* Not done on mobile for performance reasons. */ | 35 /* Not done on mobile for performance reasons. */ |
43 box-shadow: 0px 2px 2px #AAA; | 36 box-shadow: 0px 2px 2px #AAA; |
44 </if> | 37 </if> |
45 } | 38 } |
46 | 39 |
47 #diagnose-button { | 40 #diagnose-button { |
41 -webkit-margin-start: 0; | |
42 margin-bottom: 10px; | |
48 margin-top: 20px; | 43 margin-top: 20px; |
49 margin-bottom: 10px; | |
50 -webkit-margin-start: 0px; | |
51 } | 44 } |
52 | 45 |
53 #content-top #buttons, | 46 #content-top #buttons, |
54 #content-top h1 { | 47 #content-top h1 { |
55 color: #666; | 48 color: #666; |
56 margin: 10px 0px 30px 0px; | 49 font-size: 1.5em; |
57 font-weight: normal; | 50 font-weight: normal; |
58 font-size: 1.5em; | |
59 text-align: center; | 51 text-align: center; |
52 margin: 10px 0 30px 0; | |
Dan Beam
2014/08/04 17:19:02
10px 0 30px;
Randy Smith (Not in Mondays)
2014/08/04 18:05:26
Done.
| |
60 } | 53 } |
61 | 54 |
62 h2 { | 55 h2 { |
63 color: #666; | 56 color: #666; |
64 font-size: 1.2em; | 57 font-size: 1.2em; |
65 font-weight: normal; | 58 font-weight: normal; |
66 margin: 10px 0; | 59 margin: 10px 0; |
67 } | 60 } |
68 | 61 |
69 a { | 62 a { |
70 color: #15c; | 63 color: rgb(17, 85, 204); |
71 text-decoration: none; | 64 text-decoration: none; |
72 } | 65 } |
73 | 66 |
74 .icon { | 67 .icon { |
75 -webkit-user-select: none; | 68 -webkit-user-select: none; |
76 } | 69 } |
77 | 70 |
78 .icon-generic { | 71 .icon-generic { |
79 /** | 72 /** |
80 * Can't access chrome://theme/IDR_ERROR_NETWORK_GENERIC from an untrusted | 73 * Can't access chrome://theme/IDR_ERROR_NETWORK_GENERIC from an untrusted |
81 * renderer process, so embed the resource manually. | 74 * renderer process, so embed the resource manually. |
82 */ | 75 */ |
83 content: -webkit-image-set( | 76 content: -webkit-image-set( |
84 url('../../app/theme/default_100_percent/common/error_network_generic.png' ) 1x, | 77 url('../../app/theme/default_100_percent/common/error_network_generic.png' ) 1x, |
85 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); |
86 } | 79 } |
87 | 80 |
88 .icon-offline { | 81 .icon-offline { |
89 content: -webkit-image-set( | 82 content: -webkit-image-set( |
90 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, |
91 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); |
92 } | 85 } |
93 | 86 |
94 #content-top { | 87 #content-top { |
95 margin: 20px; | 88 margin: 20px; |
96 } | 89 } |
97 | 90 |
98 #help-box-outer { | 91 #help-box-outer { |
92 -webkit-transition: height ease-in 218ms; | |
99 overflow: hidden; | 93 overflow: hidden; |
100 -webkit-transition: height ease-in 218ms; | |
101 } | 94 } |
102 | 95 |
103 #help-box-inner { | 96 #help-box-inner { |
104 background-color: #f9f9f9; | 97 background-color: #f9f9f9; |
105 border-top: 1px solid #EEE; | 98 border-top: 1px solid #EEE; |
106 color: #444; | 99 color: #444; |
107 padding: 20px; | 100 padding: 20px; |
108 text-align: start; | 101 text-align: start; |
109 } | 102 } |
110 | 103 |
(...skipping 11 matching lines...) Expand all Loading... | |
122 /* Not done on mobile for performance reasons. */ | 115 /* Not done on mobile for performance reasons. */ |
123 text-shadow: 0 1px 0 rgba(255,255,255,0.3); | 116 text-shadow: 0 1px 0 rgba(255,255,255,0.3); |
124 </if> | 117 </if> |
125 } | 118 } |
126 | 119 |
127 [jscontent=failedUrl] { | 120 [jscontent=failedUrl] { |
128 overflow-wrap: break-word; | 121 overflow-wrap: break-word; |
129 } | 122 } |
130 | 123 |
131 button { | 124 button { |
125 -webkit-user-select: none; | |
132 border: 1px solid rgba(0, 0, 0, 0.25); | 126 border: 1px solid rgba(0, 0, 0, 0.25); |
133 border-radius: 2px; | 127 border-radius: 2px; |
134 color: #444; | 128 color: #444; |
135 -webkit-user-select: none; | |
136 <if expr="not is_android"> | 129 <if expr="not is_android"> |
137 /* iOS does not support linear-gradient without a prefix. */ | 130 /* iOS does not support linear-gradient without a prefix. */ |
138 background-image: -webkit-linear-gradient(#ededed, #ededed 38%, #dedede); | 131 background-image: -webkit-linear-gradient(#ededed, #ededed 38%, #dedede); |
139 text-shadow: 0 1px 0 rgb(240, 240, 240); | 132 text-shadow: 0 1px 0 rgb(240, 240, 240); |
140 </if> | 133 </if> |
141 <if expr="is_android"> | 134 <if expr="is_android"> |
142 /* Android uses flat background colors. */ | 135 /* Android uses flat background colors. */ |
143 background-color: #ededed; | 136 background-color: #ededed; |
144 font-weight: bold; | 137 font-weight: bold; |
145 </if> | 138 </if> |
146 <if expr="not is_android and not is_ios"> | 139 <if expr="not is_android and not is_ios"> |
147 /* Not done on mobile for performance reasons. */ | 140 /* Not done on mobile for performance reasons. */ |
148 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.08), inset 0 1px 2px rgba(255, 255, 255, 0 .75); | 141 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.08), |
142 inset 0 1px 2px rgba(255, 255, 255, 0.75); | |
149 </if> | 143 </if> |
150 } | 144 } |
151 | 145 |
152 button:hover { | 146 button:hover { |
153 border: 1px solid rgba(0, 0, 0, 0.3); | 147 border: 1px solid rgba(0, 0, 0, 0.3); |
154 color: #000; | 148 color: #000; |
155 <if expr="not is_android"> | 149 <if expr="not is_android"> |
156 background-image: -webkit-linear-gradient(#f0f0f0, #f0f0f0 38%, #e0e0e0); | 150 background-image: -webkit-linear-gradient(#f0f0f0, #f0f0f0 38%, #e0e0e0); |
157 </if> | 151 </if> |
158 <if expr="is_android"> | 152 <if expr="is_android"> |
159 background-color: #f0f0f0; | 153 background-color: #f0f0f0; |
160 </if> | 154 </if> |
161 <if expr="not is_android and not is_ios"> | 155 <if expr="not is_android and not is_ios"> |
162 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.12), inset 0 1px 2px rgba(255, 255, 255, 0 .95); | 156 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.12), |
157 inset 0 1px 2px rgba(255, 255, 255, 0.95); | |
163 </if> | 158 </if> |
164 } | 159 } |
165 | 160 |
166 button:active { | 161 button:active { |
167 border: 1px solid rgba(0, 0, 0, 0.3); | 162 border: 1px solid rgba(0, 0, 0, 0.3); |
168 color: #444; | 163 color: #444; |
169 <if expr="not is_android"> | 164 <if expr="not is_android"> |
170 background-image: -webkit-linear-gradient(#e7e7e7, #e7e7e7 38%, #d7d7d7); | 165 background-image: -webkit-linear-gradient(#e7e7e7, #e7e7e7 38%, #d7d7d7); |
171 </if> | 166 </if> |
172 <if expr="is_android"> | 167 <if expr="is_android"> |
173 background-color: #e7e7e7; | 168 background-color: #e7e7e7; |
174 </if> | 169 </if> |
175 <if expr="not is_android and not is_ios"> | 170 <if expr="not is_android and not is_ios"> |
176 box-shadow: none; | 171 box-shadow: none; |
177 </if> | 172 </if> |
178 } | 173 } |
179 | 174 |
180 .text-button { | 175 .text-button { |
181 margin: 0px 5px; | 176 /* Override the user agent specification of webkit-small-control. */ |
177 font: inherit; | |
178 font-size: 10pt; | |
179 margin: 0 5px; | |
182 min-height: 29px; | 180 min-height: 29px; |
183 min-width: 65px; | 181 min-width: 65px; |
184 padding: 7px 13px; | 182 padding: 7px 13px; |
185 } | 183 } |
186 | 184 |
185 .active-text { | |
186 font-size: 10pt; | |
187 margin: 0px 5px; | |
188 min-height: 29px; | |
189 min-width: 65px; | |
190 padding: 7px 13px; | |
191 color: #777777; | |
192 text-decoration: underline; | |
193 } | |
194 | |
187 .blue-button { | 195 .blue-button { |
188 color: #fff; | 196 color: #fff; |
189 <if expr="not is_android"> | 197 <if expr="not is_android"> |
190 background-image: -webkit-linear-gradient(#5d9aff, #5d9aff 38%, #5891f0); | 198 background-image: -webkit-linear-gradient(#5d9aff, #5d9aff 38%, #5891f0); |
191 border: 1px solid rgba(45, 102, 195, 1); | 199 border: 1px solid rgba(45, 102, 195, 1); |
192 text-shadow: 0 1px 0 rgba(0,0,0,0.5); | 200 text-shadow: 0 1px 0 rgba(0,0,0,0.5); |
193 </if> | 201 </if> |
194 <if expr="is_android"> | 202 <if expr="is_android"> |
195 background-color: rgb(39, 180, 231); | 203 background-color: rgb(39, 180, 231); |
196 border: 1px solid rgb(0, 152, 206); | 204 border: 1px solid rgb(0, 152, 206); |
197 </if> | 205 </if> |
198 <if expr="not is_android and not is_ios"> | 206 <if expr="not is_android and not is_ios"> |
199 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 1px 2px rgba(255, 255, 255, 0 .2); | 207 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), |
208 inset 0 1px 2px rgba(255, 255, 255, 0.2); | |
200 </if> | 209 </if> |
201 } | 210 } |
202 | 211 |
203 .blue-button:hover { | 212 .blue-button:hover { |
204 color: #fff; | 213 color: #fff; |
205 <if expr="not is_android"> | 214 <if expr="not is_android"> |
206 background-image: -webkit-linear-gradient(#659efd, #659efd 38%, #6097f1); | 215 background-image: -webkit-linear-gradient(#659efd, #659efd 38%, #6097f1); |
207 border: 1px solid rgba(45, 102, 195, 1); | 216 border: 1px solid rgba(45, 102, 195, 1); |
208 </if> | 217 </if> |
209 <if expr="not is_android and not is_ios"> | 218 <if expr="not is_android and not is_ios"> |
210 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25), inset 0 1px 2px rgba(255, 255, 255, 0 .2); | 219 box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25), |
220 inset 0 1px 2px rgba(255, 255, 255, 0.2); | |
211 </if> | 221 </if> |
212 } | 222 } |
213 | 223 |
214 .blue-button:active { | 224 .blue-button:active { |
215 <if expr="not is_android"> | 225 <if expr="not is_android"> |
216 background-image: -webkit-linear-gradient(#6095ed, #6095ed 38%, #6095ed); | 226 background-image: -webkit-linear-gradient(#6095ed, #6095ed 38%, #6095ed); |
217 border: 1px solid rgb(38, 84, 160); | 227 border: 1px solid rgb(38, 84, 160); |
218 </if> | 228 </if> |
219 <if expr="is_android"> | 229 <if expr="is_android"> |
220 background-color: rgb(0, 152, 206); | 230 background-color: rgb(0, 152, 206); |
(...skipping 12 matching lines...) Expand all Loading... | |
233 #search-box { | 243 #search-box { |
234 border: 1px solid #cdcdcd; | 244 border: 1px solid #cdcdcd; |
235 flex-grow: 1; | 245 flex-grow: 1; |
236 font-size: 16px; | 246 font-size: 16px; |
237 height: 26px; | 247 height: 26px; |
238 margin-right: 0; | 248 margin-right: 0; |
239 padding: 1px 9px; | 249 padding: 1px 9px; |
240 } | 250 } |
241 | 251 |
242 #search-box:focus { | 252 #search-box:focus { |
243 border: 1px solid #5d9aff; | 253 border: 1px solid rgb(93, 154, 255); |
244 outline: none; | 254 outline: none; |
245 } | 255 } |
246 | 256 |
247 #search-button { | 257 #search-button { |
248 border: none; | 258 border: none; |
259 border-bottom-left-radius: 0; | |
Dan Beam
2014/08/04 17:19:02
this is probably wrong in RTL
Randy Smith (Not in Mondays)
2014/08/04 18:05:26
Meaning my re-ordering of the CSS properties as pe
| |
249 border-top-left-radius: 0; | 260 border-top-left-radius: 0; |
250 border-bottom-left-radius: 0; | |
251 box-shadow: none; | 261 box-shadow: none; |
252 display: flex; | 262 display: flex; |
253 height: 30px; | 263 height: 30px; |
254 margin: 0; | 264 margin: 0; |
265 padding: 0; | |
255 width: 60px; | 266 width: 60px; |
256 padding: 0; | |
257 } | 267 } |
258 | 268 |
259 #search-image { | 269 #search-image { |
260 content: | 270 content: |
261 -webkit-image-set( | 271 -webkit-image-set( |
262 url('../../app/theme/default_100_percent/common/omnibox_search_button_ loupe.png') 1x, | 272 url('../../app/theme/default_100_percent/common/omnibox_search_button_ loupe.png') 1x, |
263 url('../../app/theme/default_200_percent/common/omnibox_search_button_ loupe.png') 2x); | 273 url('../../app/theme/default_200_percent/common/omnibox_search_button_ loupe.png') 2x); |
264 margin: auto; | 274 margin: auto; |
265 } | 275 } |
266 | 276 |
(...skipping 25 matching lines...) Expand all Loading... | |
292 line-height: 18px; | 302 line-height: 18px; |
293 } | 303 } |
294 } | 304 } |
295 | 305 |
296 /* Decrease padding at low sizes. */ | 306 /* Decrease padding at low sizes. */ |
297 @media (max-width: 640px), (max-height: 640px) { | 307 @media (max-width: 640px), (max-height: 640px) { |
298 body { | 308 body { |
299 margin: 15px; | 309 margin: 15px; |
300 } | 310 } |
301 h1 { | 311 h1 { |
302 margin: 10px 0px 15px 0px; | 312 margin: 10px 0 15px 0; |
Dan Beam
2014/08/04 17:19:02
margin: 10px 0 15px;
Randy Smith (Not in Mondays)
2014/08/04 18:05:26
Done.
| |
303 } | 313 } |
304 #content-top { | 314 #content-top { |
305 margin: 15px; | 315 margin: 15px; |
306 } | 316 } |
307 #help-box-inner { | 317 #help-box-inner { |
308 padding: 20px; | 318 padding: 20px; |
309 } | 319 } |
310 .suggestions { | 320 .suggestions { |
311 margin-top: 10px; | 321 margin-top: 10px; |
312 } | 322 } |
313 .suggestion-header { | 323 .suggestion-header { |
314 margin-bottom: 0px; | 324 margin-bottom: 0; |
315 } | 325 } |
316 .error-code { | 326 .error-code { |
317 margin-top: 10px; | 327 margin-top: 10px; |
318 } | 328 } |
319 } | 329 } |
320 | 330 |
321 /* Don't allow overflow when in a subframe. */ | 331 /* Don't allow overflow when in a subframe. */ |
322 html[subframe] body { | 332 html[subframe] body { |
323 overflow: hidden; | 333 overflow: hidden; |
324 } | 334 } |
325 | 335 |
326 #sub-frame-error { | 336 #sub-frame-error { |
327 -webkit-align-items: center; | 337 -webkit-align-items: center; |
338 -webkit-flex-flow: column; | |
339 -webkit-justify-content: center; | |
328 background-color: #DDD; | 340 background-color: #DDD; |
329 display: -webkit-flex; | 341 display: -webkit-flex; |
330 -webkit-flex-flow: column; | |
331 height: 100%; | 342 height: 100%; |
332 -webkit-justify-content: center; | 343 left: 0; |
333 left: 0px; | |
334 position: absolute; | 344 position: absolute; |
335 top: 0px; | 345 top: 0; |
336 width: 100%; | 346 width: 100%; |
337 } | 347 } |
338 | 348 |
339 #sub-frame-error:hover { | 349 #sub-frame-error:hover { |
340 background-color: #EEE; | 350 background-color: #EEE; |
341 } | 351 } |
342 | 352 |
343 #sub-frame-error-details { | 353 #sub-frame-error-details { |
344 margin: 0 10px; | 354 margin: 0 10px; |
345 visibility: hidden; | 355 visibility: hidden; |
346 } | 356 } |
347 | 357 |
348 /* Show details only when hovering. */ | 358 /* Show details only when hovering. */ |
349 #sub-frame-error:hover #sub-frame-error-details { | 359 #sub-frame-error:hover #sub-frame-error-details { |
350 visibility: visible; | 360 visibility: visible; |
351 } | 361 } |
352 | 362 |
353 /* If the iframe is too small, always hide the error code. */ | 363 /* If the iframe is too small, always hide the error code. */ |
354 /* TODO(mmenke): See if overflow: no-display works better, once supported. */ | 364 /* TODO(mmenke): See if overflow: no-display works better, once supported. */ |
355 @media (max-width: 200px), (max-height: 95px) { | 365 @media (max-width: 200px), (max-height: 95px) { |
356 #sub-frame-error-details { | 366 #sub-frame-error-details { |
357 display: none; | 367 display: none; |
358 } | 368 } |
359 } | 369 } |
370 | |
371 /* The JavaScript will set the suggested-* class on the #buttons | |
372 <div>, and that will indicate to the different control surfaces | |
373 if they should float left or right. If there's only a details | |
Dan Beam
2014/08/04 17:19:02
opt nit: 1\s between comments
Randy Smith (Not in Mondays)
2014/08/04 18:05:26
Sorry, I'm not understanding. One space between t
| |
374 button, it should be centered. */ | |
mmenke
2014/08/04 15:57:39
I don't think I've seen this style used in Chrome.
Randy Smith (Not in Mondays)
2014/08/04 16:14:41
Ok. I don't consider that comment really really i
mmenke
2014/08/04 16:18:03
That wasn't meant to be a dig at the importance of
Bernhard Bauer
2014/08/04 16:32:17
I don't have a strong opinion on which exact style
Dan Beam
2014/08/04 17:19:02
cssdoc and closure stylesheets do parse
/**
Randy Smith (Not in Mondays)
2014/08/04 18:05:26
Moot given rewrite; I'll take this into account if
| |
375 .suggested-left > #control-buttons, | |
376 .suggested-right > #details-button { | |
377 float: left; | |
378 } | |
379 | |
380 .suggested-right > #control-buttons, | |
381 .suggested-left > #details-button { | |
382 float: right; | |
383 } | |
384 | |
385 #details-button.singular { | |
386 float: none; | |
387 } | |
388 | |
389 #buttons::after { | |
390 clear: both; | |
391 content: ''; | |
392 display: block; | |
393 width: 100%; | |
394 } | |
Dan Beam
2014/08/04 17:19:02
why are you using float and a clearfix instead of
Randy Smith (Not in Mondays)
2014/08/04 18:05:26
Because I don't really know CSS (which you probabl
| |
OLD | NEW |