Skip to content

Fix: whitespace between the main content and progressive sidebar #7271

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

Merged
merged 4 commits into from
Dec 13, 2024
Merged

Fix: whitespace between the main content and progressive sidebar #7271

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47760db
Fix whitespace between the main content and progressive sidebar
amyy2 Nov 21, 2024
421bd90
Remove .DS_Store files
amyy2 Nov 21, 2024
92ec511
Merge remote-tracking branch 'upstream/main' into fix-whitespace-on-s…
amyy2 Dec 3, 2024
ee86a02
Fix scrolling on sidebar
amyy2 Dec 3, 2024
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
12 changes: 7 additions & 5 deletions apps/site/layouts/layouts.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
mx-auto
block
w-full
overflow-auto
sm:grid
sm:grid-cols-[theme(spacing.52)_1fr]
sm:grid-rows-[1fr]
Expand All @@ -24,21 +23,22 @@
xl:grid-cols-[theme(spacing.80)_1fr_theme(spacing.80)];

> *:nth-child(1) {
@apply grid-in-[sidebar];
@apply grid-in-[sidebar]
lg:sticky
lg:top-0
lg:h-[100vh]
lg:overflow-y-auto;
}

> *:nth-child(2) {
@apply contents
overflow-y-scroll
sm:max-lg:block;

> *:first-child {
@apply grid-in-[main]
sm:bg-gradient-subtle
sm:dark:bg-gradient-subtle-dark
xl:px-18
overflow-y-auto
overflow-x-hidden
p-4
motion-safe:scroll-smooth
sm:bg-fixed
Expand All @@ -50,6 +50,8 @@
mt-8
border-t
sm:mt-0
lg:sticky
lg:top-0
lg:max-w-xs
lg:border-l
lg:border-t-0;
Expand Down
Loading