Skip to content

Commit 65ebc95

Browse files
authored
remove content-scroll-container from content-grid & add scroll to content (#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
1 parent e415c57 commit 65ebc95

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

packages/experiments-realm/components/layout.gts

+4-7
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
136136
{{yield to='contentHeader'}}
137137
</header>
138138
{{#if (has-block 'grid')}}
139-
<div class='content-grid content-scroll-container'>
139+
<div class='content-grid'>
140140
{{yield to='grid'}}
141141
</div>
142142
{{/if}}
@@ -168,6 +168,7 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
168168
flex-grow: 1;
169169
display: grid;
170170
grid-template-rows: max-content 1fr;
171+
overflow-y: scroll;
171172
}
172173
173174
/* these help hide overlay button visibility through gaps during scroll */
@@ -208,12 +209,8 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
208209
}
209210
.content-grid {
210211
max-width: 100%;
211-
padding-left: var(--layout-padding);
212-
padding-bottom: var(--layout-padding);
213-
}
214-
.content-scroll-container {
215-
padding-right: var(--layout-padding);
216-
overflow: auto;
212+
padding: var(--layout-padding);
213+
padding-top: 0;
217214
}
218215
</style>
219216
</template>

packages/experiments-realm/crm-app.gts

+4
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,10 @@ class CrmAppTemplate extends Component<typeof CrmApp> {
716716
.crm-app.Deal {
717717
--strip-view-min-width: 1fr;
718718
}
719+
.crm-app.Task:deep(.content-grid) {
720+
padding-bottom: 0;
721+
padding-right: 0;
722+
}
719723
</style>
720724
</template>
721725
}

packages/seed-realm/components/layout.gts

+4-7
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
136136
{{yield to='contentHeader'}}
137137
</header>
138138
{{#if (has-block 'grid')}}
139-
<div class='content-grid content-scroll-container'>
139+
<div class='content-grid'>
140140
{{yield to='grid'}}
141141
</div>
142142
{{/if}}
@@ -168,6 +168,7 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
168168
flex-grow: 1;
169169
display: grid;
170170
grid-template-rows: max-content 1fr;
171+
overflow-y: scroll;
171172
}
172173
173174
/* these help hide overlay button visibility through gaps during scroll */
@@ -208,12 +209,8 @@ export class Layout extends GlimmerComponent<LayoutSignature> {
208209
}
209210
.content-grid {
210211
max-width: 100%;
211-
padding-left: var(--layout-padding);
212-
padding-bottom: var(--layout-padding);
213-
}
214-
.content-scroll-container {
215-
padding-right: var(--layout-padding);
216-
overflow: auto;
212+
padding: var(--layout-padding);
213+
padding-top: 0;
217214
}
218215
</style>
219216
</template>

0 commit comments

Comments
 (0)