Index: components/security_interstitials/core/browser/resources/interstitial_v2.css |
diff --git a/components/security_interstitials/core/browser/resources/interstitial_v2.css b/components/security_interstitials/core/browser/resources/interstitial_v2.css |
index ee0ea06c4d318c8d1d5dbb39cef7590b53879140..ebb5e48d58cbb0c15a6d590aa9abec1267776506 100644 |
--- a/components/security_interstitials/core/browser/resources/interstitial_v2.css |
+++ b/components/security_interstitials/core/browser/resources/interstitial_v2.css |
@@ -331,10 +331,10 @@ |
* Details message replaces the top content in its own scrollable area. |
*/ |
-@media (max-width: 420px) { |
+@media (max-width: 420px) and (max-height: 736px) and (orientation: portrait) { |
#details-button { |
border: 0; |
- margin: 28px 0 0; |
+ margin: 8px 0 0; |
} |
.secondary-button { |
@@ -345,17 +345,18 @@ |
/* Fixed nav. */ |
@media (min-width: 240px) and (max-width: 420px) and |
- (min-height: 401px), |
- (min-width: 421px) and (min-height: 240px) and |
- (max-height: 736px) { |
+ (min-height: 401px) and (max-height: 736px) and (orientation:portrait), |
+ (min-width: 421px) and (max-width: 736px) and (min-height: 240px) and |
+ (max-height: 420px) and (orientation:landscape) { |
body .nav-wrapper { |
background: #f7f7f7; |
bottom: 0; |
box-shadow: 0 -22px 40px rgb(247, 247, 247); |
+ left: 0; |
margin: 0; |
max-width: 736px; |
- padding-left: 0px; |
- padding-right: 48px; |
+ padding-left: 24px; |
+ padding-right: 24px; |
position: fixed; |
z-index: 2; |
} |
@@ -375,8 +376,8 @@ |
} |
} |
-@media (max-width: 420px) and (orientation: portrait), |
- (max-height: 736px) { |
+@media (max-width: 420px) and (max-height: 736px) and (orientation: portrait), |
+ (max-width: 736px) and (max-height: 420px) and (orientation: landscape) { |
body { |
margin: 0 auto; |
} |
@@ -435,7 +436,7 @@ |
.interstitial-wrapper { |
box-sizing: border-box; |
- margin: 7vh auto 12px; |
+ margin: 24px auto 12px; |
padding: 0 24px; |
position: relative; |
} |
@@ -462,34 +463,151 @@ |
} |
} |
-@media (min-width: 421px) and (min-height: 500px) and (max-height: 736px) { |
- .interstitial-wrapper { |
- margin-top: 10vh; |
- } |
-} |
- |
@media (min-height: 400px) and (orientation:portrait) { |
.interstitial-wrapper { |
margin-bottom: 145px; |
} |
} |
-@media (min-height: 299px) { |
+@media (min-height: 299px) and (orientation:portrait) { |
.nav-wrapper { |
padding-bottom: 16px; |
} |
} |
-@media (min-height: 500px) and (max-height: 650px) and (max-width: 414px) and |
- (orientation: portrait) { |
- .interstitial-wrapper { |
- margin-top: 7vh; |
- } |
-} |
- |
-@media (min-height: 650px) and (max-width: 414px) and (orientation: portrait) { |
- .interstitial-wrapper { |
- margin-top: 10vh; |
+@media (min-height: 405px) and (max-height: 736px) and |
+ (max-width: 420px) and (orientation:portrait) { |
+ .icon { |
+ margin-bottom: 24px; |
+ } |
+ |
+ .interstitial-wrapper { |
+ margin-top: 64px; |
+ } |
+} |
+ |
+@media (min-height: 480px) and (max-width: 420px) and |
+ (max-height: 736px) and (orientation: portrait), |
+ (min-height: 338px) and (max-height: 420px) and (max-width: 736px) and |
+ (orientation: landscape) { |
+ .icon { |
+ margin-bottom: 24px; |
+ } |
+ |
+ .nav-wrapper { |
+ padding-bottom: 24px; |
+ } |
+} |
+ |
+@media (min-height: 500px) and (max-width: 414px) and (orientation: portrait) { |
+ .interstitial-wrapper { |
+ margin-top: 96px; |
+ } |
+} |
+ |
+/* Phablet sizing */ |
+@media (min-width: 375px) and (min-height: 641px) and (max-height: 736px) and |
+ (max-width: 414px) and (orientation: portrait) { |
+ button, |
+ [dir='rtl'] button, |
+ .small-link { |
+ font-size: 1em; |
+ padding-bottom: 12px; |
+ padding-top: 12px; |
+ } |
+ |
+ body:not(.offline) .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; |
+ } |
+} |
+ |
+@media (min-width: 420px) and (max-width: 736px) and |
+ (min-height: 240px) and (max-height: 298px) and |
+ (orientation:landscape) { |
+ body:not(.offline) .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; |
+ } |
+ |
+ #extended-reporting-opt-in { |
+ margin-top: 0; |
+ } |
+} |
+ |
+/* Phablet landscape */ |
+@media (min-width: 680px) and (max-height: 414px) { |
+ .interstitial-wrapper { |
+ margin: 24px auto; |
+ } |
+ |
+ .nav-wrapper { |
+ margin: 16px auto 0; |
+ } |
+} |
+ |
+@media (max-height: 240px) and (orientation: landscape), |
+ (max-height: 480px) and (orientation: portrait), |
+ (max-width: 419px) and (max-height: 323px) { |
+ body:not(.offline) .icon { |
+ height: 56px; |
+ width: 56px; |
+ } |
+ |
+ .icon { |
+ margin-bottom: 16px; |
} |
} |