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