Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove content-scroll-container from content-grid & add scroll to content #2164

Merged
merged 2 commits into from
Feb 20, 2025
Merged

remove content-scroll-container from content-grid & add scroll to content #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c89a4ca
remove content-scroll-container from content-grid & add scroll behavi…
lucaslyl Feb 19, 2025
e4014e4
remove content grid padding bottom and right for crm-app Task Tab
lucaslyl Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions packages/experiments-realm/components/layout.gts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions packages/experiments-realm/crm-app.gts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
}
Expand Down
11 changes: 4 additions & 7 deletions packages/seed-realm/components/layout.gts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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>
Expand Down