From 4050d97d8de16466750f364802127f5477cc6b25 Mon Sep 17 00:00:00 2001
From: laryn <laryn@kragtbakker.com>
Date: Mon, 13 May 2024 14:32:07 -0500
Subject: [PATCH] Don't push sticky region down if no admin bar.

---
 dist/css/base/gin.css     |  8 ++++++--
 styles/base/_regions.scss | 14 +++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dist/css/base/gin.css b/dist/css/base/gin.css
index 51e9b3fa..65738eb8 100644
--- a/dist/css/base/gin.css
+++ b/dist/css/base/gin.css
@@ -254,7 +254,7 @@ button.link:active,
     margin-bottom: 0;
   }
 
-  .gin--navigation .region-sticky, .gin--vertical-toolbar .region-sticky, .gin--horizontal-toolbar .admin-bar--fixed .region-sticky, .gin--classic-toolbar .region-sticky {
+  .admin-bar .gin--navigation .region-sticky, .admin-bar .gin--vertical-toolbar .region-sticky, .admin-bar .gin--horizontal-toolbar .admin-bar--fixed .region-sticky, .admin-bar .gin--classic-toolbar .region-sticky {
     top: var(--gin-toolbar-y-offset);
   }
 }
@@ -347,10 +347,14 @@ button.link:active,
 @media (min-width: 64em) {
   .sticky-shadow {
     position: sticky;
-    top: calc(var(--gin-toolbar-y-offset) + var(--gin-height-sticky) - 40px);
+    top: calc(var(--gin-height-sticky) - 40px);
     width: calc(100% - min(10vw, 96px) + var(--gin-spacing-l));
   }
 
+  .admin-bar .sticky-shadow {
+    top: calc(var(--gin-height-sticky) - 40px + var(--gin-toolbar-y-offset));
+  }
+
   .gin--classic-toolbar:not(.gin--edit-form) .sticky-shadow {
     display: none;
   }
diff --git a/styles/base/_regions.scss b/styles/base/_regions.scss
index 71f440e9..ba24781c 100644
--- a/styles/base/_regions.scss
+++ b/styles/base/_regions.scss
@@ -52,10 +52,10 @@
     height: var(--gin-height-sticky);
     margin-bottom: 0;
 
-    .gin--navigation &,
-    .gin--vertical-toolbar &,
-    .gin--horizontal-toolbar .admin-bar--fixed &,
-    .gin--classic-toolbar & {
+    .admin-bar .gin--navigation &,
+    .admin-bar .gin--vertical-toolbar &,
+    .admin-bar .gin--horizontal-toolbar .admin-bar--fixed &,
+    .admin-bar .gin--classic-toolbar & {
       top: var(--gin-toolbar-y-offset);
     }
   }
@@ -140,9 +140,13 @@
 
   @include mq(large) {
     position: sticky;
-    top: calc(var(--gin-toolbar-y-offset) + (var(--gin-height-sticky) - 40px));
+    top: calc((var(--gin-height-sticky) - 40px));
     width: calc(100% - min(10vw, 96px) + var(--gin-spacing-l));
 
+    .admin-bar & {
+      top: calc((var(--gin-height-sticky) - 40px) + var(--gin-toolbar-y-offset));
+    }
+
     // Classic, legacy toolbar
     .gin--classic-toolbar:not(.gin--edit-form) & {
       display: none;