From 47760db00cff849e2b07d883a30d035f4ce234da Mon Sep 17 00:00:00 2001 From: amyy2 <27amys@gmail.com> Date: Thu, 21 Nov 2024 10:19:23 -0500 Subject: [PATCH 1/3] Fix whitespace between the main content and progressive sidebar --- .DS_Store | Bin 0 -> 8196 bytes apps/.DS_Store | Bin 0 -> 6148 bytes apps/site/layouts/layouts.module.css | 9 +++++++-- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .DS_Store create mode 100644 apps/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9850a18a478c4f6931db7972e085521bde118168 GIT binary patch literal 8196 zcmeHM-A)rh6g~shw)|){kZ@zNiMNOdA~D{S(n^|OA#8ydHML7CR+e4T9~(nRdadu^ zD|qXZ_%2@Qcg_sW?$X{Glg>0VXMWB%=bUe6cY9hQQiWdQ3DFV}Wl&k>X3>l&yw3GT znKCmAkP3Jz`{9Y_haSec8`^flGGH073|Iy%1D1jRfdRa;xn#z?_w}l6Ed!Q;iDZDE z4-P8JypaPf<nx z|I@qhTb=Ie>Mu1low{{9ozA9b)9>7mVc+f6yS+}K-hRWQY8d+7b-(T%wVM4}ZecqN zy7gAjYzv^(XhP-faVuzq{X*Ca8Xdv9dLf(5WNW#l%geRRjb&$jbK`2+xqQC1y6ik% ze|B}1%`85A{NkW?=AQ@QR~@P{j|-aD<6-*^yp>t{^xcUKHl&hKH9(!~QY>5uYjbqe<1ZGh%yR=JNRDi_;$g0R1?Z9?f zd>Ub0aWqluI)Vz&CD^Vaf+KQG930oEJ$@(lxND-W!jCfiImA9??6xxsJ;mHbJ(#5v zYEwvkYEX*;V7`DgKh6N+Bl;dWVT%&szIe@kR^Y>H_`NTdE931G^B>(QM@{OGFSfg| zega$K z1V>Foc`m&kyoT>_obVgP-NXG_M^tBMPoe(^s8Gfd9Y-7Afw@+9B3#cUb{K~PvoTyI zflGMGOvd!HV6X)1MS3-!!5HEWP8y$m=8x|MK6iZojXAY3>Z<~o`;4i7TRN?>t literal 0 HcmV?d00001 diff --git a/apps/.DS_Store b/apps/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..308ff363c5b752c2685cc172f927f5d3eef106d2 GIT binary patch literal 6148 zcmeHKPfrs;6rTsxc0pu;7Kwk7jlG!AD1u0g2bY2|)dPejSVFPxwnJT6X6o)1L_*Sw z7yST!06&0NuYLeMdey`);Kj4P`BM-)44p2q92x)vpp_5<)WA z1g3hh`-KRq13!w##y&zz~5V^qzNot^Qi$$~X8HMv``c5aN1 z6|8F$*LQb~OfG-r=0bHn*kJsHq8;$NB&APd2VSDGSC3!Y)b+soPCcJYQ&*HRdU{Xw zo$faW28RZ+1G(JrnUUP!*>mTs=8)&s)*GRC(itA`uo$#x)$EV3-cpUT`H*g6o#mK5 zjUE3Px&{v=EYSLcebeH06JxUb207`SkW#kN2>trp+FC^8@=yA*SgjWFAeiToAN!mw zSLEt3-6*j&jw^~Mm}?4Gv_!)Q@kma2HE=x|%&{VmW4^KMhM~(Ew76aNu?q3za!IG@ z)_m5;-}4Yrc ztbw*p{K4>JH_|j@dXHV@Nx=yN2?Kv(Kztu8YyxeKZH4mFft|bpAd24zDX7a|e?&_d z5N(ZZg=j$mm5QiRL0>UI-yA@tqu *:last-child { @@ -61,6 +65,7 @@ sticky bottom-0 flex + h-[4rem] w-full flex-col items-center From 421bd90a163449a80f21bb74356366fc0492d547 Mon Sep 17 00:00:00 2001 From: amyy2 <27amys@gmail.com> Date: Thu, 21 Nov 2024 11:48:26 -0500 Subject: [PATCH 2/3] Remove .DS_Store files --- .DS_Store | Bin 8196 -> 0 bytes apps/.DS_Store | Bin 6148 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 apps/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 9850a18a478c4f6931db7972e085521bde118168..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHM-A)rh6g~shw)|){kZ@zNiMNOdA~D{S(n^|OA#8ydHML7CR+e4T9~(nRdadu^ zD|qXZ_%2@Qcg_sW?$X{Glg>0VXMWB%=bUe6cY9hQQiWdQ3DFV}Wl&k>X3>l&yw3GT znKCmAkP3Jz`{9Y_haSec8`^flGGH073|Iy%1D1jRfdRa;xn#z?_w}l6Ed!Q;iDZDE z4-P8JypaPf<nx z|I@qhTb=Ie>Mu1low{{9ozA9b)9>7mVc+f6yS+}K-hRWQY8d+7b-(T%wVM4}ZecqN zy7gAjYzv^(XhP-faVuzq{X*Ca8Xdv9dLf(5WNW#l%geRRjb&$jbK`2+xqQC1y6ik% ze|B}1%`85A{NkW?=AQ@QR~@P{j|-aD<6-*^yp>t{^xcUKHl&hKH9(!~QY>5uYjbqe<1ZGh%yR=JNRDi_;$g0R1?Z9?f zd>Ub0aWqluI)Vz&CD^Vaf+KQG930oEJ$@(lxND-W!jCfiImA9??6xxsJ;mHbJ(#5v zYEwvkYEX*;V7`DgKh6N+Bl;dWVT%&szIe@kR^Y>H_`NTdE931G^B>(QM@{OGFSfg| zega$K z1V>Foc`m&kyoT>_obVgP-NXG_M^tBMPoe(^s8Gfd9Y-7Afw@+9B3#cUb{K~PvoTyI zflGMGOvd!HV6X)1MS3-!!5HEWP8y$m=8x|MK6iZojXAY3>Z<~o`;4i7TRN?>t diff --git a/apps/.DS_Store b/apps/.DS_Store deleted file mode 100644 index 308ff363c5b752c2685cc172f927f5d3eef106d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKPfrs;6rTsxc0pu;7Kwk7jlG!AD1u0g2bY2|)dPejSVFPxwnJT6X6o)1L_*Sw z7yST!06&0NuYLeMdey`);Kj4P`BM-)44p2q92x)vpp_5<)WA z1g3hh`-KRq13!w##y&zz~5V^qzNot^Qi$$~X8HMv``c5aN1 z6|8F$*LQb~OfG-r=0bHn*kJsHq8;$NB&APd2VSDGSC3!Y)b+soPCcJYQ&*HRdU{Xw zo$faW28RZ+1G(JrnUUP!*>mTs=8)&s)*GRC(itA`uo$#x)$EV3-cpUT`H*g6o#mK5 zjUE3Px&{v=EYSLcebeH06JxUb207`SkW#kN2>trp+FC^8@=yA*SgjWFAeiToAN!mw zSLEt3-6*j&jw^~Mm}?4Gv_!)Q@kma2HE=x|%&{VmW4^KMhM~(Ew76aNu?q3za!IG@ z)_m5;-}4Yrc ztbw*p{K4>JH_|j@dXHV@Nx=yN2?Kv(Kztu8YyxeKZH4mFft|bpAd24zDX7a|e?&_d z5N(ZZg=j$mm5QiRL0>UI-yA@tqu Date: Tue, 3 Dec 2024 12:30:04 -0500 Subject: [PATCH 3/3] Fix scrolling on sidebar --- apps/site/layouts/layouts.module.css | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/apps/site/layouts/layouts.module.css b/apps/site/layouts/layouts.module.css index 044cf8c009768..ccfd3720bd5bf 100644 --- a/apps/site/layouts/layouts.module.css +++ b/apps/site/layouts/layouts.module.css @@ -10,11 +10,10 @@ .articleLayout { @apply max-w-8xl sm:grid-areas-[sidebar_main,sidebar_footer] - lg:grid-areas-[sidebar_._metabar,sidebar_main_metabar,sidebar_footer_metabar] + lg:grid-areas-[sidebar_main_metabar,sidebar_footer_metabar] mx-auto block w-full - overflow-auto sm:grid sm:grid-cols-[theme(spacing.52)_1fr] sm:grid-rows-[1fr] @@ -24,12 +23,15 @@ 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 { @@ -37,16 +39,10 @@ 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 - sm:p-12 - lg:sticky - lg:bottom-[4rem] - lg:h-max - lg:min-h-[calc(100vh_-_4rem)]; + sm:p-12; } > *:last-child { @@ -54,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; @@ -65,7 +63,6 @@ sticky bottom-0 flex - h-[4rem] w-full flex-col items-center