Reland of SafeBrowsing: update interstitial layouts

components/security_interstitials/core/browser/resources/interstitial_v2.css

 /* Copyright 2014 The Chromium Authors. All rights reserved.
    Use of this source code is governed by a BSD-style license that can be
    found in the LICENSE file. */
 
 a {
   color: #585858;
 }
 
 .bad-clock .icon {
   background-image: -webkit-image-set(
@@ skipping 105 matching lines @@
   margin-bottom: 16px;
 }
 
 h2 {
   font-size: 1.2em;
   font-weight: normal;
 }
 
 .hidden {
   display: none;
+  opacity: 0;
+  overflow: hidden;
+  transition: none;

[edwardjung, 2017/04/25 10:32:04]

Are you sure this fixes the issue? 

Looking at the code, in the mobile layout, these attributes are overridden by
the media query, so the details are still 'visible'.

  #details.hidden,
  #main-content.hidden {
    display: block;
    height: 0;
    opacity: 0;
    overflow: hidden;
    transition: none;
  }

[Nate Fischer, 2017/04/25 19:04:42]

That code in the media query looked like a bug, so I already removed it in
patchset 2. If it's in another spot (I only see line 414 in the original file),
please let me know.

[edwardjung, 2017/04/25 19:50:04]

Apologies, I missed the removal of that other code.

That block wasn't a bug. The idea behind using opacity was so that the details
text comes in with a fade in transition rather than just appearing directly.
It's a subtle difference but feels nicer.

Can you fix that browser test instead? Checking for opacity rather than display
block when the mobile size nav kicks in? 

On 2017/04/25 19:04:42, Nate Fischer wrote:

 }
 
 html {
   -webkit-text-size-adjust: 100%;
   font-size: 125%;
 }
 
 .icon {
   background-repeat: no-repeat;
   background-size: 100%;
@@ skipping 188 matching lines @@
     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 (max-height: 736px) and (orientation: portrait) {
+@media (max-width: 420px) {
   #details-button {
     border: 0;
-    margin: 8px 0 0;
+    margin: 28px 0 0;
   }
 
   .secondary-button {
     -webkit-margin-end: 0;
     margin-top: 16px;
   }
 }
 
 /* Fixed nav. */
 @media (min-width: 240px) and (max-width: 420px) and
-       (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) {
+       (min-height: 401px),
+       (min-width: 421px) and (min-height: 240px) and
+       (max-height: 736px) {
   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: 24px;
-    padding-right: 24px;
+    padding-left: 0px;
+    padding-right: 48px;
     position: fixed;
     z-index: 2;
   }
 
   body.safe-browsing .nav-wrapper {
     background: rgb(206, 52, 38);
     box-shadow: 0 -22px 40px rgb(206, 52, 38);
   }
 
   .interstitial-wrapper {
     max-width: 736px;
   }
 
   #details,
   #main-content {
     padding-bottom: 40px;
   }
+
+  #details {
+    padding-top: 40px;
+  }

[edwardjung, 2017/04/25 10:32:04]

This wasn't in the original CL, it is required for the bug fix?

Suggestion to use proportional units, 5.5vh gives you ~ a range of 20 to 40px.

[Nate Fischer, 2017/04/25 19:04:42]

This has to do with the change above. Setting `display = block` for
details.hidden,main-content.hidden caused the padding-bottom to be turned on for
both (even while hidden). Because main-content sits above details, its
padding-bottom = 40px acted like a padding-top for details (which was probably a
mistake). Since main-content.hidden is actually hidden now, I had to add the
padding back to the un-hidden details.

Your suggestion for 5.5vh looks good though, so I'll go with that instead.

 }
 
-@media (max-width: 420px) and (max-height: 736px) and (orientation: portrait),
-       (max-width: 736px) and (max-height: 420px) and (orientation: landscape) {
+@media (max-width: 420px) and (orientation: portrait),
+       (max-height: 736px) {
   body {
     margin: 0 auto;
   }
 
   button,
   [dir='rtl'] button,
   button.small-link {
     font-family: Roboto-Regular,Helvetica;
     font-size: .933em;
     font-weight: 600;
@@ skipping 13 matching lines @@
   }
 
   #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;
-    transition: none;
-  }
-
   #details-button {
     padding-bottom: 16px;
     padding-top: 16px;
   }
 
   h1 {
     font-size: 1.5em;
     margin-bottom: 8px;
   }
 
   .icon {
     margin-bottom: 12px;
   }
 
   .interstitial-wrapper {
     box-sizing: border-box;
-    margin: 24px auto 12px;
+    margin: 7vh auto 12px;
     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-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) and (orientation:portrait) {
+@media (min-height: 299px) {
   .nav-wrapper {
     padding-bottom: 16px;
   }
 }
 
-@media (min-height: 405px) and (max-height: 736px) and
-       (max-width: 420px) and (orientation:portrait) {
-  .icon {
-    margin-bottom: 24px;
-  }
-
+@media (min-height: 500px) and (max-height: 650px) and (max-width: 414px) and
+       (orientation: portrait) {
   .interstitial-wrapper {
-    margin-top: 64px;
+    margin-top: 7vh;
   }
 }
 
-@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: 650px) and (max-width: 414px) and (orientation: portrait) {
+  .interstitial-wrapper {
+    margin-top: 10vh;
   }
 }
 
-@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;
-  }
-}
-
 /* Small mobile screens. No fixed nav. */
 @media (max-height: 400px) and (orientation: portrait),
        (max-height: 239px) and (orientation: landscape),
        (max-width: 419px) and (max-height: 399px) {
   .interstitial-wrapper {
     display: flex;
     flex-direction: column;
     margin-bottom: 0;
   }
 
@@ skipping 17 matching lines @@
     width: 100%;
   }
 }
 
 @media (max-width: 239px) and (orientation: portrait) {
   .nav-wrapper {
     padding-left: 0;
     padding-right: 0;
   }
 }