From 056b96fbe0f86ba6718f530c9cee1e59554b3529 Mon Sep 17 00:00:00 2001
From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Fri, 11 Oct 2024 21:06:01 -0400
Subject: [PATCH] Change layout strategy

---
 extensions/BugModal/web/bug_modal.css |  6 ++---
 skins/standard/global.css             | 39 ++++++++++-----------------
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css
index f96b6b8ff9..f7d4d93fe6 100644
--- a/extensions/BugModal/web/bug_modal.css
+++ b/extensions/BugModal/web/bug_modal.css
@@ -918,9 +918,10 @@ td.flag-requestee {
 
 .new-changes-link {
   position: sticky;
-  top: calc(var(--global-header-height) + 8px);
+  top: 8px;
   z-index: 10;
   overflow: hidden;
+  margin: 0 0 8px;
   border-radius: 4px;
   padding: 4px;
   color: var(--primary-button-foreground-color);
@@ -1440,7 +1441,7 @@ a.comment-tag-url {
 
 #main-inner {
   display: flow-root;
-  margin: 8px auto;
+  margin: 8px auto 48px;
   max-width: 1024px;
 }
 
@@ -1665,7 +1666,6 @@ a.lightbox-icon.markdown {
 
 #changeform {
   display: flow-root;
-  margin: 8px 0 48px;
 }
 
 #changeform:not(.show-advanced-fields) .expert_fields {
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 81bd4278bb..76da70a6b3 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -370,21 +370,11 @@
  * Global
  */
 
-html {
-  /* Ensure that shift-tab and other ways of scrolling up take the fixed header into account. */
-  scroll-padding-top: calc(var(--global-header-height) + 8px);
-}
-
-html:has(#private-bug-banner) {
-  scroll-padding-top: calc(var(--global-header-height) + var(--bug-banner-height) + 8px);
-}
-
 body {
   margin: 0;
   font-size: var(--font-size-medium);
   line-height: var(--line-height-default);
   font-family: var(--font-family-sans-serif);
-  scrollbar-color: var(--scrollbar-color);
 }
 
 pre,
@@ -943,27 +933,32 @@ input[type="radio"]:checked {
   flex: auto;
   display: flow-root;
   position: relative;
+  overflow: auto;
   outline: none;
-  width: 100dvw;
+  scroll-padding-top: 8px;
 }
 
 @media screen {
   body {
-    position: absolute;
-    width: 100%;
-    height: 100%;
     color: var(--application-foreground-color);
     background-color: var(--application-background-color);
+    scrollbar-color: var(--scrollbar-color);
+  }
+
+  #wrapper {
+    position: fixed;
+    inset: 0;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    width: 100%;
+    height: 100%;
   }
 
   #main-inner {
     position: relative;
     margin: 16px;
   }
-
-  #wrapper {
-    margin-top: var(--global-header-height);
-  }
 }
 
 /**
@@ -972,10 +967,6 @@ input[type="radio"]:checked {
 
 #header {
   flex: none;
-  position: fixed;
-  inset: 0 0 auto;
-  z-index: 11;
-  width: 100%;
   height: var(--global-header-height);
   color: var(--application-header-foreground-color);
   background-color: var(--application-header-background-color);
@@ -1522,9 +1513,7 @@ input[type="radio"]:checked {
  */
 
 #private-bug-banner {
-  position: sticky;
-  top: var(--global-header-height);
-  z-index: 2;
+  flex: none;
   background-color: var(--confidential-bug-background-color);
   color: #111;
   box-sizing: border-box;