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

Side by Side Diff: chrome/browser/resources/security_warnings/interstitial_v2.css

Issue 865943002: Update SSL/malware/net error interstitial design (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switch button layout switching from JS to CSS flexbox Created 5 years, 11 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
OLDNEW
1 /* Copyright 2014 The Chromium Authors. All rights reserved. 1 /* Copyright 2014 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 a { 5 a {
6 color: #585858; 6 color: #585858;
7 } 7 }
8 8
9 .bad-clock .icon { 9 .bad-clock .icon {
10 background-image: -webkit-image-set( 10 background-image: -webkit-image-set(
11 url(images/1x/clock.png) 1x, 11 url(images/1x/clock.png) 1x,
12 url(images/2x/clock.png) 2x); 12 url(images/2x/clock.png) 2x);
13 } 13 }
14 14
15 body { 15 body {
16 background-color: #f7f7f7; 16 background-color: #f7f7f7;
17 color: #585858; 17 color: #646464;
18 } 18 }
19 19
20 body.safe-browsing { 20 body.safe-browsing {
21 background-color: rgb(206, 52, 38); 21 background-color: rgb(206, 52, 38);
22 color: white; 22 color: white;
23 } 23 }
24 24
25 button { 25 button {
26 background: rgb(76, 142, 250); 26 background: rgb(76, 142, 250);
27 border: 0; 27 border: 0;
(...skipping 15 matching lines...) Expand all
43 43
44 button:active { 44 button:active {
45 background: rgb(50, 102, 213); 45 background: rgb(50, 102, 213);
46 outline: 0; 46 outline: 0;
47 } 47 }
48 48
49 button:hover { 49 button:hover {
50 box-shadow: 0 1px 3px rgba(0, 0, 0, .50); 50 box-shadow: 0 1px 3px rgba(0, 0, 0, .50);
51 } 51 }
52 52
53 #debugging {
54 overflow: auto;
55 }
56
53 .debugging-content { 57 .debugging-content {
54 line-height: 1em; 58 line-height: 1em;
55 margin-bottom: 0; 59 margin-bottom: 0;
56 margin-top: 0; 60 margin-top: 0;
57 } 61 }
58 62
59 .debugging-title { 63 .debugging-title {
60 font-weight: bold; 64 font-weight: bold;
61 } 65 }
62 66
63 #details { 67 #details {
64 color: #696969; 68 color: #696969;
65 margin: 45px 0 50px; 69 margin: 45px 0 50px;
66 } 70 }
67 71
68 #details p:not(:first-of-type) { 72 #details p:not(:first-of-type) {
69 margin-top: 20px; 73 margin-top: 20px;
70 } 74 }
71 75
76 #details-button {
77 background: inherit;
78 border: 0;
79 float: none;
80 margin: -6px 0 0;
81 padding: 0;
82 text-decoration: underline;
83 }
84
85 #details-button:hover {
86 box-shadow: inherit;
87 }
88
72 #error-code { 89 #error-code {
73 color: black; 90 color: black;
91 font-size: .825em;
74 opacity: .35; 92 opacity: .35;
75 text-transform: uppercase; 93 text-transform: uppercase;
76 } 94 }
77 95
78 #error-debugging-info { 96 #error-debugging-info {
79 font-size: 0.8em; 97 font-size: 0.8em;
98 overflow: auto;
80 } 99 }
81 100
82 h1 { 101 h1 {
83 color: #585858; 102 color: #333;
84 font-size: 1.6em; 103 font-size: 1.6em;
85 font-weight: normal; 104 font-weight: normal;
86 line-height: 1.25em; 105 line-height: 1.25em;
87 margin-bottom: 16px; 106 margin-bottom: 16px;
88 } 107 }
89 108
90 h2 { 109 h2 {
91 font-size: 1.2em; 110 font-size: 1.2em;
92 font-weight: normal; 111 font-weight: normal;
93 } 112 }
94 113
95 .hidden { 114 .hidden {
96 display: none; 115 display: none;
97 } 116 }
98 117
99 html { 118 html {
119 -webkit-text-size-adjust: 100%;
100 font-size: 125%; 120 font-size: 125%;
101 } 121 }
102 122
103 .icon { 123 .icon {
104 background-repeat: no-repeat; 124 background-repeat: no-repeat;
105 background-size: 100%; 125 background-size: 100%;
106 height: 72px; 126 height: 72px;
107 margin: 0 0 40px; 127 margin: 0 0 40px;
108 width: 72px; 128 width: 72px;
109 } 129 }
(...skipping 30 matching lines...) Expand all
140 #opt-in-label { 160 #opt-in-label {
141 -webkit-margin-start: 32px; 161 -webkit-margin-start: 32px;
142 } 162 }
143 163
144 .safe-browsing :-webkit-any( 164 .safe-browsing :-webkit-any(
145 a, #details, #details-button, h1, h2, p, .small-link) { 165 a, #details, #details-button, h1, h2, p, .small-link) {
146 color: white; 166 color: white;
147 } 167 }
148 168
149 .safe-browsing button { 169 .safe-browsing button {
150 background-color: rgb(206, 52, 38); 170 background-color: rgba(255, 255, 255, .15);
151 border: 1px solid white;
152 } 171 }
153 172
154 .safe-browsing button:active { 173 .safe-browsing button:active {
155 background-color: rgb(206, 52, 38); 174 background-color: rgba(255, 255, 255, .25);
156 border-color: rgba(255, 255, 255, .6);
157 } 175 }
158 176
159 .safe-browsing button:hover { 177 .safe-browsing button:hover {
160 box-shadow: 0 2px 3px rgba(0, 0, 0, .5); 178 box-shadow: 0 2px 3px rgba(0, 0, 0, .5);
161 } 179 }
162 180
163 .safe-browsing .icon { 181 .safe-browsing .icon {
164 background-image: -webkit-image-set( 182 background-image: -webkit-image-set(
165 url(images/1x/stop_sign.png) 1x, 183 url(images/1x/stop_sign.png) 1x,
166 url(images/2x/stop_sign.png) 2x); 184 url(images/2x/stop_sign.png) 2x);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 padding: 0 10%; 249 padding: 0 10%;
232 } 250 }
233 } 251 }
234 252
235 @media (max-height: 600px) { 253 @media (max-height: 600px) {
236 .interstitial-wrapper { 254 .interstitial-wrapper {
237 margin-top: 13%; 255 margin-top: 13%;
238 } 256 }
239 } 257 }
240 258
241 @media (max-width: 400px) { 259 @media (max-width: 420px) {
242 button, 260 button,
243 [dir='rtl'] button { 261 [dir='rtl'] button,
262 .small-link {
244 float: none; 263 float: none;
245 font-size: 1em; 264 font-size: .825em;
265 font-weight: 400;
266 text-transform: uppercase;
246 width: 100%; 267 width: 100%;
247 } 268 }
248 269
249 #details { 270 #details {
250 margin: 20px 0 20px 0; 271 margin: 20px 0 20px 0;
251 } 272 }
252 273
253 #details p:not(:first-of-type) { 274 #details p:not(:first-of-type) {
254 margin-top: 10px; 275 margin-top: 10px;
255 } 276 }
256 277
257 #details-button { 278 #details-button {
258 display: block; 279 display: block;
259 padding-top: 14px;
260 text-align: center; 280 text-align: center;
261 width: 100%; 281 width: 100%;
262 } 282 }
263 283
264 .interstitial-wrapper { 284 .interstitial-wrapper {
265 padding: 0 5%; 285 padding: 0 5%;
266 } 286 }
267 287
268 #malware-opt-in { 288 #malware-opt-in {
269 margin-top: 24px; 289 margin-top: 24px;
270 } 290 }
271 291
272 .nav-wrapper { 292 .nav-wrapper {
273 margin-top: 30px; 293 margin-top: 30px;
274 } 294 }
275 295 }
296
297 /**
298 * Mobile specific styling.
299 * Navigation buttons are anchored to the bottom of the screen.
300 * Details message replaces the top content in it's own scrollable area.
felt 2015/01/27 15:19:01 nit: "its"
301 */
302
303 @media (max-width: 420px) and (orientation: portrait) {
304 #details-button {
305 border: 0;
306 margin: 20px 0 0;
307 }
308 }
309
310 /* Fixed nav. */
311 @media (min-width:320px) and (max-width: 420px) and
312 (min-height: 400px) and (orientation:portrait),
313 (min-width: 421px) and (max-width: 736px) and (min-height: 240px) and
314 (max-height: 420px) and (orientation:landscape) {
315
316 body:not(.offline) .nav-wrapper {
317 background: #f7f7f7;
318 bottom: 0;
319 left: 0;
320 position: fixed;
321 z-index: 1;
322 }
323
324 body.safe-browsing .nav-wrapper {
325 background: rgb(206, 52, 38);
326 }
327 }
328
329 @media (max-width: 420px) and (orientation: portrait),
330 (max-width: 736px) and (max-height: 420px) and (orientation: landscape) {
331 body {
332 margin: 0 auto;
333 }
334
335 button,
336 [dir='rtl'] button,
337 button.small-link {
338 font-family: helvetica;
339 font-size: .933em;
340 font-weight: 600;
341 text-transform: uppercase;
342 }
343
344 .nav-wrapper {
345 box-sizing: border-box;
346 padding: 16px 24px 8px;
347 width: 100%;
348 }
349
350 #details {
351 box-sizing: border-box;
352 height: auto;
353 margin: 0;
354 opacity: 1;
355 transition: opacity 250ms cubic-bezier(0.4, 0, 0.2, 1);
356 }
357
358 #details.hidden,
359 #main-content.hidden {
360 display: block;
361 height: 0;
362 opacity: 0;
363 overflow: hidden;
364 }
365
366 #details-button {
367 height: 48px;
368 }
369
370 h1 {
371 font-size: 1.5em;
372 margin-bottom: 8px;
373 }
374
375 .icon {
376 margin-bottom: 12px;
377 }
378
379 .interstitial-wrapper {
380 box-sizing: border-box;
381 margin: 24px 0 12px;
382 max-width: initial;
383 overflow: auto;
384 padding: 0 24px;
385 position: relative;
386 }
387
388 .interstitial-wrapper p {
389 font-size: .95em;
390 line-height: 1.61em;
391 margin-top: 8px;
392 }
393
394 #main-content {
395 margin: 0;
396 transition: opacity 100ms cubic-bezier(0.4, 0, 0.2, 1);
397 }
398
399 .small-link {
400 border: 0;
401 }
402
403 .suggested-left > #control-buttons,
404 .suggested-right > #control-buttons {
405 float: none;
406 margin: 0;
407 }
408 }
409
410 @media (min-height: 400px) and (orientation:portrait) {
411 body:not(.safe-browsing-has-checkbox):not(.offline) .interstitial-wrapper {
412 margin-bottom: 145px;
413 }
414 }
415
416 @media (min-height: 299px) and (orientation:portrait) {
417 .nav-wrapper {
418 padding-bottom: 16px;
419 }
420 }
421
422 @media (min-height: 405px) and (orientation:portrait) {
423 .icon {
424 margin-bottom: 24px;
425 }
426
427 .interstitial-wrapper {
428 margin-top: 64px;
429 }
430 }
431
432 @media (min-height: 480px) and (max-width: 420px) and (orientation: portrait),
433 (min-height: 338px) and (max-height: 420px) and (max-width: 736px) and
434 (orientation: landscape) {
435 .icon {
436 margin-bottom: 24px;
437 }
438
439 .nav-wrapper {
440 padding: 16px 24px 24px;
441 }
442 }
443
444 @media (min-height: 500px) and (max-width: 414px) and (orientation: portrait) {
445 :not(.safe-browsing-has-checkbox) .interstitial-wrapper {
446 margin-top: 96px;
447 }
448 }
449
450 /* Phablet sizing */
451 @media (min-width: 375px) and (min-height: 641px) and
452 (max-width: 414px) and (orientation: portrait) {
453 button,
454 [dir='rtl'] button,
276 .small-link { 455 .small-link {
277 font-size: 1em; 456 font-size: 1em;
278 } 457 height: 40px;
279 } 458 }
459
460 body:not(.neterror) .icon {
461 height: 80px;
462 width: 80px;
463 }
464
465 #details-button {
466 margin-top: 28px;
467 }
468
469 h1 {
470 font-size: 1.7em;
471 }
472
473 .icon {
474 margin-bottom: 28px;
475 }
476
477 .interstitial-wrapper {
478 padding: 28px;
479 }
480
481 .interstitial-wrapper p {
482 font-size: 1.05em;
483 }
484
485 .nav-wrapper {
486 padding: 28px;
487 }
488
489 .neterror .icon {
490 height: 80px;
491 width: 65.6px;
492 }
493 }
494
495 @media (min-width: 420px) and (max-width: 736px) and
496 (min-height: 240px) and (max-height: 298px) and
497 (orientation:landscape) {
498 body:not(.neterror) .icon {
499 height: 50px;
500 width: 50px;
501 }
502
503 .icon {
504 padding-top: 0;
505 }
506
507 .interstitial-wrapper {
508 margin-top: 16px;
509 }
510
511 .nav-wrapper {
512 padding: 0 24px 8px;
513 }
514 }
515
516 @media (min-width: 420px) and (max-width: 736px) and
517 (min-height: 240px) and (max-height: 420px) and
518 (orientation:landscape) {
519 #details-button {
520 margin: 0;
521 }
522
523 .interstitial-wrapper {
524 margin-bottom: 70px;
525 }
526
527 .nav-wrapper {
528 margin-top: 0;
529 }
530
531 #malware-opt-in {
532 margin-top: 0;
533 }
534
535 #reload-button,
536 #primary-button {
537 margin: 6px 0;
538 }
539 }
540
541 /* Phablet landscape */
542 @media (min-width: 680px) and (max-height: 414px) {
543 .interstitial-wrapper {
544 margin: 24px auto;
545 }
546
547 .nav-wrapper {
548 margin: 0 auto;
549 }
550 }
551
552 @media (max-height: 404px) {
553 button {
554 margin-top: 0;
555 }
556
557 #details-button {
558 height: 32px;
559 margin: 8px 0;
560 }
561 }
562
563 @media (max-height: 240px) and (orientation: landscape),
564 (max-height: 480px) and (orientation: portrait),
565 (max-width: 419px) and (max-height: 323px) {
566 body:not(.neterror) .icon {
567 height: 56px;
568 width: 56px;
569 }
570
571 .icon {
572 margin-bottom: 16px;
573 }
574 }
575
576 /* Small mobile screens. No fixed nav. */
577 @media (max-height: 400px) and (orientation: portrait),
578 (max-height: 240px) and (orientation: landscape) {
579 .interstitial-wrapper {
580 display: flex;
581 flex-direction: column;
582 margin-bottom: 0;
583 }
584
585 #details {
586 flex: 1 1 auto;
587 order: 0;
588 }
589
590 #main-content {
591 flex: 1 1 auto;
592 order: 0;
593 }
594
595 .nav-wrapper {
596 flex: 0 1 auto;
597 margin-top: 0;
598 order: 1;
599 padding-left: 0;
600 padding-right: 0;
601 position: relative;
602 }
603 }
604
605 /* Malware opt-in. No fixed nav. */
606 @media (max-height: 600px) and (orientation: portrait),
607 (max-height: 360px) and (orientation: landscape) {
608 .safe-browsing-has-checkbox .interstitial-wrapper {
609 display: flex;
610 flex-direction: column;
611 margin-bottom: 0;
612 }
613
614 .safe-browsing-has-checkbox #details {
615 flex: 1 1 auto;
616 order: 0;
617 }
618
619 .safe-browsing-has-checkbox #main-content {
620 flex: 1 1 auto;
621 order: 0;
622 }
623
624 .safe-browsing-has-checkbox #malware-opt-in {
625 margin-bottom: 8px;
626 }
627
628 body.safe-browsing-has-checkbox .nav-wrapper {
629 flex: 0 1 auto;
630 margin-top: 0;
631 order: 1;
632 padding-left: 0;
633 padding-right: 0;
634 position: relative;
635 }
636 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698