remove content-scroll-container from content-grid & add scroll to con…

…tent (#2164) * remove content-scroll-container from content-grid & add scroll behaviour to content * remove content grid padding bottom and right for crm-app Task Tab
cardstack · Feb 20, 2025 · 65ebc95 · 65ebc95
1 parent e415c57
commit 65ebc95
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/packages/experiments-realm/components/layout.gts b/packages/experiments-realm/components/layout.gts
@@ -136,7 +136,7 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
           {{yield to='contentHeader'}}
         </header>
         {{#if (has-block 'grid')}}
-          <div class='content-grid content-scroll-container'>
+          <div class='content-grid'>
             {{yield to='grid'}}
           </div>
         {{/if}}
@@ -168,6 +168,7 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
         flex-grow: 1;
         display: grid;
         grid-template-rows: max-content 1fr;
+        overflow-y: scroll;
       }
 
       /* these help hide overlay button visibility through gaps during scroll */
@@ -208,12 +209,8 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
       }
       .content-grid {
         max-width: 100%;
-        padding-left: var(--layout-padding);
-        padding-bottom: var(--layout-padding);
-      }
-      .content-scroll-container {
-        padding-right: var(--layout-padding);
-        overflow: auto;
+        padding: var(--layout-padding);
+        padding-top: 0;
       }
     </style>
   </template>

diff --git a/packages/experiments-realm/crm-app.gts b/packages/experiments-realm/crm-app.gts
@@ -716,6 +716,10 @@ class CrmAppTemplate extends Component<typeof CrmApp> {
       .crm-app.Deal {
         --strip-view-min-width: 1fr;
       }
+      .crm-app.Task:deep(.content-grid) {
+        padding-bottom: 0;
+        padding-right: 0;
+      }
     </style>
   </template>
 }

diff --git a/packages/seed-realm/components/layout.gts b/packages/seed-realm/components/layout.gts
@@ -136,7 +136,7 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
           {{yield to='contentHeader'}}
         </header>
         {{#if (has-block 'grid')}}
-          <div class='content-grid content-scroll-container'>
+          <div class='content-grid'>
             {{yield to='grid'}}
           </div>
         {{/if}}
@@ -168,6 +168,7 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
         flex-grow: 1;
         display: grid;
         grid-template-rows: max-content 1fr;
+        overflow-y: scroll;
       }
 
       /* these help hide overlay button visibility through gaps during scroll */
@@ -208,12 +209,8 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
       }
       .content-grid {
         max-width: 100%;
-        padding-left: var(--layout-padding);
-        padding-bottom: var(--layout-padding);
-      }
-      .content-scroll-container {
-        padding-right: var(--layout-padding);
-        overflow: auto;
+        padding: var(--layout-padding);
+        padding-top: 0;
       }
     </style>
   </template>