| Index: chrome/browser/resources/security_warnings/interstitial_v2.css
|
| diff --git a/chrome/browser/resources/security_warnings/interstitial_v2.css b/chrome/browser/resources/security_warnings/interstitial_v2.css
|
| index 7c1ee1011bfbc1d53d4363c61059468df1bbf6f3..acc271a2b69aba1d526e039f3daf699a1a27128b 100644
|
| --- a/chrome/browser/resources/security_warnings/interstitial_v2.css
|
| +++ b/chrome/browser/resources/security_warnings/interstitial_v2.css
|
| @@ -14,7 +14,7 @@ a {
|
|
|
| body {
|
| background-color: #f7f7f7;
|
| - color: #585858;
|
| + color: #646464;
|
| }
|
|
|
| body.safe-browsing {
|
| @@ -50,6 +50,10 @@ button:hover {
|
| box-shadow: 0 1px 3px rgba(0, 0, 0, .50);
|
| }
|
|
|
| +#debugging {
|
| + overflow: auto;
|
| +}
|
| +
|
| .debugging-content {
|
| line-height: 1em;
|
| margin-bottom: 0;
|
| @@ -69,18 +73,33 @@ button:hover {
|
| margin-top: 20px;
|
| }
|
|
|
| +#details-button {
|
| + background: inherit;
|
| + border: 0;
|
| + float: none;
|
| + margin: -6px 0 0;
|
| + padding: 0;
|
| + text-decoration: underline;
|
| +}
|
| +
|
| +#details-button:hover {
|
| + box-shadow: inherit;
|
| +}
|
| +
|
| #error-code {
|
| color: black;
|
| + font-size: .825em;
|
| opacity: .35;
|
| text-transform: uppercase;
|
| }
|
|
|
| #error-debugging-info {
|
| font-size: 0.8em;
|
| + overflow: auto;
|
| }
|
|
|
| h1 {
|
| - color: #585858;
|
| + color: #333;
|
| font-size: 1.6em;
|
| font-weight: normal;
|
| line-height: 1.25em;
|
| @@ -97,6 +116,7 @@ h2 {
|
| }
|
|
|
| html {
|
| + -webkit-text-size-adjust: 100%;
|
| font-size: 125%;
|
| }
|
|
|
| @@ -147,13 +167,11 @@ input[type=checkbox] {
|
| }
|
|
|
| .safe-browsing button {
|
| - background-color: rgb(206, 52, 38);
|
| - border: 1px solid white;
|
| + background-color: rgba(255, 255, 255, .15);
|
| }
|
|
|
| .safe-browsing button:active {
|
| - background-color: rgb(206, 52, 38);
|
| - border-color: rgba(255, 255, 255, .6);
|
| + background-color: rgba(255, 255, 255, .25);
|
| }
|
|
|
| .safe-browsing button:hover {
|
| @@ -207,7 +225,7 @@ input[type=checkbox] {
|
| width: 14px;
|
| }
|
|
|
| -.styled-checkbox label::after {
|
| +.styled-checkbox .checkbox-tick {
|
| background: transparent;
|
| border: 2px solid white;
|
| border-right-width: 0;
|
| @@ -222,7 +240,7 @@ input[type=checkbox] {
|
| width: 9px;
|
| }
|
|
|
| -.styled-checkbox input[type=checkbox]:checked + label::after {
|
| +.styled-checkbox input[type=checkbox]:checked ~ .checkbox-tick {
|
| opacity: 1;
|
| }
|
|
|
| @@ -238,11 +256,14 @@ input[type=checkbox] {
|
| }
|
| }
|
|
|
| -@media (max-width: 400px) {
|
| +@media (max-width: 420px) {
|
| button,
|
| - [dir='rtl'] button {
|
| + [dir='rtl'] button,
|
| + .small-link {
|
| float: none;
|
| - font-size: 1em;
|
| + font-size: .825em;
|
| + font-weight: 400;
|
| + text-transform: uppercase;
|
| width: 100%;
|
| }
|
|
|
| @@ -256,7 +277,6 @@ input[type=checkbox] {
|
|
|
| #details-button {
|
| display: block;
|
| - padding-top: 14px;
|
| text-align: center;
|
| width: 100%;
|
| }
|
| @@ -272,8 +292,345 @@ input[type=checkbox] {
|
| .nav-wrapper {
|
| margin-top: 30px;
|
| }
|
| +}
|
| +
|
| +/**
|
| + * Mobile specific styling.
|
| + * Navigation buttons are anchored to the bottom of the screen.
|
| + * Details message replaces the top content in its own scrollable area.
|
| + */
|
| +
|
| +@media (max-width: 420px) and (orientation: portrait) {
|
| + #details-button {
|
| + border: 0;
|
| + margin: 20px 0 0;
|
| + }
|
| +}
|
| +
|
| +/* Fixed nav. */
|
| +@media (min-width:320px) and (max-width: 420px) and
|
| + (min-height: 400px) and (orientation:portrait),
|
| + (min-width: 421px) and (max-width: 736px) and (min-height: 240px) and
|
| + (max-height: 420px) and (orientation:landscape) {
|
| +
|
| + body:not(.offline) .nav-wrapper {
|
| + background: #f7f7f7;
|
| + bottom: 0;
|
| + left: 0;
|
| + position: fixed;
|
| + z-index: 1;
|
| + }
|
| +
|
| + body.safe-browsing .nav-wrapper {
|
| + background: rgb(206, 52, 38);
|
| + }
|
| +}
|
| +
|
| +@media (max-width: 420px) and (orientation: portrait),
|
| + (max-width: 736px) and (max-height: 420px) and (orientation: landscape) {
|
| + body {
|
| + margin: 0 auto;
|
| + }
|
| +
|
| + button,
|
| + [dir='rtl'] button,
|
| + button.small-link {
|
| + font-family: Roboto-Regular,Helvetica;
|
| + font-size: .933em;
|
| + font-weight: 600;
|
| + text-transform: uppercase;
|
| + }
|
| +
|
| + .nav-wrapper {
|
| + box-sizing: border-box;
|
| + padding: 16px 24px 8px;
|
| + width: 100%;
|
| + }
|
| +
|
| + #details {
|
| + box-sizing: border-box;
|
| + height: auto;
|
| + margin: 0;
|
| + opacity: 1;
|
| + transition: opacity 250ms cubic-bezier(0.4, 0, 0.2, 1);
|
| + }
|
| +
|
| + #details.hidden,
|
| + #main-content.hidden {
|
| + display: block;
|
| + height: 0;
|
| + opacity: 0;
|
| + overflow: hidden;
|
| + }
|
| +
|
| + #details-button {
|
| + height: 48px;
|
| + }
|
| +
|
| + h1 {
|
| + font-size: 1.5em;
|
| + margin-bottom: 8px;
|
| + }
|
| +
|
| + .icon {
|
| + margin-bottom: 12px;
|
| + }
|
| +
|
| + .interstitial-wrapper {
|
| + box-sizing: border-box;
|
| + margin: 24px 0 12px;
|
| + max-width: initial;
|
| + overflow: auto;
|
| + padding: 0 24px;
|
| + position: relative;
|
| + }
|
| +
|
| + .interstitial-wrapper p {
|
| + font-size: .95em;
|
| + line-height: 1.61em;
|
| + margin-top: 8px;
|
| + }
|
| +
|
| + #main-content {
|
| + margin: 0;
|
| + transition: opacity 100ms cubic-bezier(0.4, 0, 0.2, 1);
|
| + }
|
|
|
| .small-link {
|
| + border: 0;
|
| + }
|
| +
|
| + .suggested-left > #control-buttons,
|
| + .suggested-right > #control-buttons {
|
| + float: none;
|
| + margin: 0;
|
| + }
|
| +}
|
| +
|
| +@media (min-height: 400px) and (orientation:portrait) {
|
| + body:not(.safe-browsing-has-checkbox):not(.offline) .interstitial-wrapper {
|
| + margin-bottom: 145px;
|
| + }
|
| +}
|
| +
|
| +@media (min-height: 299px) and (orientation:portrait) {
|
| + .nav-wrapper {
|
| + padding-bottom: 16px;
|
| + }
|
| +}
|
| +
|
| +@media (min-height: 405px) and (orientation:portrait) {
|
| + .icon {
|
| + margin-bottom: 24px;
|
| + }
|
| +
|
| + .interstitial-wrapper {
|
| + margin-top: 64px;
|
| + }
|
| +}
|
| +
|
| +@media (min-height: 480px) and (max-width: 420px) and (orientation: portrait),
|
| + (min-height: 338px) and (max-height: 420px) and (max-width: 736px) and
|
| + (orientation: landscape) {
|
| + .icon {
|
| + margin-bottom: 24px;
|
| + }
|
| +
|
| + .nav-wrapper {
|
| + padding: 16px 24px 24px;
|
| + }
|
| +}
|
| +
|
| +@media (min-height: 500px) and (max-width: 414px) and (orientation: portrait) {
|
| + :not(.safe-browsing-has-checkbox) .interstitial-wrapper {
|
| + margin-top: 96px;
|
| + }
|
| +}
|
| +
|
| +/* Phablet sizing */
|
| +@media (min-width: 375px) and (min-height: 641px) and
|
| + (max-width: 414px) and (orientation: portrait) {
|
| + button,
|
| + [dir='rtl'] button,
|
| + .small-link {
|
| font-size: 1em;
|
| + height: 40px;
|
| + }
|
| +
|
| + body:not(.neterror) .icon {
|
| + height: 80px;
|
| + width: 80px;
|
| + }
|
| +
|
| + #details-button {
|
| + margin-top: 28px;
|
| + }
|
| +
|
| + h1 {
|
| + font-size: 1.7em;
|
| + }
|
| +
|
| + .icon {
|
| + margin-bottom: 28px;
|
| + }
|
| +
|
| + .interstitial-wrapper {
|
| + padding: 28px;
|
| + }
|
| +
|
| + .interstitial-wrapper p {
|
| + font-size: 1.05em;
|
| + }
|
| +
|
| + .nav-wrapper {
|
| + padding: 28px;
|
| + }
|
| +
|
| + .neterror .icon {
|
| + height: 80px;
|
| + width: 65.6px;
|
| + }
|
| +}
|
| +
|
| +@media (min-width: 420px) and (max-width: 736px) and
|
| + (min-height: 240px) and (max-height: 298px) and
|
| + (orientation:landscape) {
|
| + body:not(.neterror) .icon {
|
| + height: 50px;
|
| + width: 50px;
|
| + }
|
| +
|
| + .icon {
|
| + padding-top: 0;
|
| + }
|
| +
|
| + .interstitial-wrapper {
|
| + margin-top: 16px;
|
| + }
|
| +
|
| + .nav-wrapper {
|
| + padding: 0 24px 8px;
|
| + }
|
| +}
|
| +
|
| +@media (min-width: 420px) and (max-width: 736px) and
|
| + (min-height: 240px) and (max-height: 420px) and
|
| + (orientation:landscape) {
|
| + #details-button {
|
| + margin: 0;
|
| + }
|
| +
|
| + .interstitial-wrapper {
|
| + margin-bottom: 70px;
|
| + }
|
| +
|
| + .nav-wrapper {
|
| + margin-top: 0;
|
| + }
|
| +
|
| + #malware-opt-in {
|
| + margin-top: 0;
|
| + }
|
| +
|
| + #reload-button,
|
| + #primary-button {
|
| + margin: 6px 0;
|
| + }
|
| +}
|
| +
|
| +/* Phablet landscape */
|
| +@media (min-width: 680px) and (max-height: 414px) {
|
| + .interstitial-wrapper {
|
| + margin: 24px auto;
|
| + }
|
| +
|
| + .nav-wrapper {
|
| + margin: 0 auto;
|
| + }
|
| +}
|
| +
|
| +@media (max-height: 404px) {
|
| + button {
|
| + margin-top: 0;
|
| + }
|
| +
|
| + #details-button {
|
| + height: 32px;
|
| + margin: 8px 0;
|
| + }
|
| +}
|
| +
|
| +@media (max-height: 240px) and (orientation: landscape),
|
| + (max-height: 480px) and (orientation: portrait),
|
| + (max-width: 419px) and (max-height: 323px) {
|
| + body:not(.neterror) .icon {
|
| + height: 56px;
|
| + width: 56px;
|
| + }
|
| +
|
| + .icon {
|
| + margin-bottom: 16px;
|
| + }
|
| +}
|
| +
|
| +/* Small mobile screens. No fixed nav. */
|
| +@media (max-height: 400px) and (orientation: portrait),
|
| + (max-height: 240px) and (orientation: landscape) {
|
| + .interstitial-wrapper {
|
| + display: flex;
|
| + flex-direction: column;
|
| + margin-bottom: 0;
|
| + }
|
| +
|
| + #details {
|
| + flex: 1 1 auto;
|
| + order: 0;
|
| + }
|
| +
|
| + #main-content {
|
| + flex: 1 1 auto;
|
| + order: 0;
|
| + }
|
| +
|
| + .nav-wrapper {
|
| + flex: 0 1 auto;
|
| + margin-top: 0;
|
| + order: 1;
|
| + padding-left: 0;
|
| + padding-right: 0;
|
| + position: relative;
|
| + }
|
| +}
|
| +
|
| +/* Malware opt-in. No fixed nav. */
|
| +@media (max-height: 600px) and (orientation: portrait),
|
| + (max-height: 360px) and (orientation: landscape) {
|
| + .safe-browsing-has-checkbox .interstitial-wrapper {
|
| + display: flex;
|
| + flex-direction: column;
|
| + margin-bottom: 0;
|
| + }
|
| +
|
| + .safe-browsing-has-checkbox #details {
|
| + flex: 1 1 auto;
|
| + order: 0;
|
| + }
|
| +
|
| + .safe-browsing-has-checkbox #main-content {
|
| + flex: 1 1 auto;
|
| + order: 0;
|
| + }
|
| +
|
| + .safe-browsing-has-checkbox #malware-opt-in {
|
| + margin-bottom: 8px;
|
| + }
|
| +
|
| + body.safe-browsing-has-checkbox .nav-wrapper {
|
| + flex: 0 1 auto;
|
| + margin-top: 0;
|
| + order: 1;
|
| + padding-left: 0;
|
| + padding-right: 0;
|
| + position: relative;
|
| }
|
| }
|
|
|