File tree Expand file tree Collapse file tree 6 files changed +20
-21
lines changed
packages/ui/src/components/icons Expand file tree Collapse file tree 6 files changed +20
-21
lines changed Original file line number Diff line number Diff line change @@ -171,12 +171,10 @@ export default function DashboardInner({
171171 { /*End of NavBar*/ }
172172 < main
173173 className = {
174- "flex overscroll-contain flex-col flex-1 flex-grow p-5 h-full border border-b-0 custom-scroll bg-gray-2 border-gray-3 lg:rounded-tl-2xl lg:p-8"
174+ "flex overscroll-contain flex-col flex-1 p-5 h-full border border-b-0 custom-scroll bg-gray-2 border-gray-3 lg:rounded-tl-2xl lg:p-8"
175175 }
176176 >
177- < div className = "flex flex-col flex-1 flex-grow gap-4 min-h-fit" >
178- { children }
179- </ div >
177+ < div className = "flex flex-col flex-1 gap-4 min-h-fit" > { children } </ div >
180178 </ main >
181179 { isSharedCapsPage && activeOrganization ?. members && (
182180 < MembersDialog
Original file line number Diff line number Diff line change @@ -92,7 +92,7 @@ const Orgs = ({
9292 name = { activeOrg ?. organization . name ?? "No organization found" }
9393 />
9494 ) }
95- < p className = "text-xs mr-2 text-gray-12 truncate w-fit max-w-[90px]" >
95+ < p className = "text-sm mr-2 text-gray-12 truncate w-fit max-w-[90px]" >
9696 { activeOrg ?. organization . name }
9797 </ p >
9898 < ChevronDown
Original file line number Diff line number Diff line change @@ -26,45 +26,40 @@ export const DesktopNav = () => {
2626 toggleSidebarCollapsed ( ) ;
2727 }
2828 } ;
29-
3029 window . addEventListener ( "keydown" , handleKeyDown ) ;
31-
32- return ( ) => {
33- window . removeEventListener ( "keydown" , handleKeyDown ) ;
34- } ;
30+ return ( ) => window . removeEventListener ( "keydown" , handleKeyDown ) ;
3531 } , [ toggleSidebarCollapsed ] ) ;
3632
3733 return (
3834 < motion . div
39- initial = { {
40- width : sidebarCollapsed ? "70px" : "230px" ,
41- } }
35+ initial = { false }
4236 animate = { {
43- width : sidebarCollapsed ? "70px" : "230px" ,
37+ width : sidebarCollapsed ? 70 : 230 ,
4438 transition : {
4539 duration : 0.6 ,
4640 type : "spring" ,
4741 bounce : 0.25 ,
4842 } ,
4943 } }
50- className = { clsx ( "hidden z-50 h-full lg:flex group" , "relative" ) }
44+ className = { clsx (
45+ "hidden relative z-50 h-full will-change-[width] lg:flex group bg-gray-1" ,
46+ ) }
5147 >
5248 < div className = "flex flex-col w-full max-w-[220px] mx-auto h-full" >
5349 < div className = "flex justify-start items-center px-3 pt-5 mb-3.5 w-full truncate min-h-8" >
5450 < Link href = "/dashboard" >
5551 < Logo
5652 hideLogoName = { sidebarCollapsed }
53+ viewBoxDimensions = { sidebarCollapsed ? "0 0 40 40" : "0 0 120 40" }
5754 className = "mx-auto w-[120px] h-[40px]"
5855 />
5956 </ Link >
6057 </ div >
61-
6258 < div className = "flex overflow-y-auto flex-col flex-grow" >
6359 < div className = "flex flex-col px-3 h-full" >
6460 < AdminNavItems />
6561 </ div >
6662 </ div >
67-
6863 < Tooltip
6964 kbd = { [ cmdSymbol , "Shift" , "S" ] }
7065 position = "right"
Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ export default async function DashboardLayout({
8080 userPreferences = { userPreferences }
8181 >
8282 < div className = "grid grid-cols-[auto,1fr] bg-gray-1 grid-rows-[auto,1fr] h-dvh min-h-dvh" >
83- < aside className = "hidden z-10 col-span-1 row-span-2 lg:flex" >
83+ < aside className = "hidden z-10 col-span-1 row-span-2 w-full lg:flex" >
8484 < DesktopNav />
8585 </ aside >
8686 < div className = "flex col-span-2 row-span-2 h-full md:col-span-1 focus:outline-none" >
Original file line number Diff line number Diff line change @@ -594,12 +594,18 @@ slot:not(.dashboard-layout slot) {
594594.hide-scroll ::-webkit-scrollbar {
595595 display : none;
596596}
597-
598597/* Custom scrollbar */
599598.custom-scroll {
600599 overflow-y : auto;
600+ scrollbar-gutter : stable;
601601}
602602
603+ /* Fallback for scrollbar-gutter */
604+ @supports not (scrollbar-gutter : stable) {
605+ .custom-scroll {
606+ padding-right : 3px ; /* Reserve space for scrollbar */
607+ }
608+ }
603609.custom-scroll ::-webkit-scrollbar {
604610 width : 3px ;
605611 background-color : transparent;
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ export const Logo = ({
44 showBeta,
55 white,
66 hideLogoName,
7- viewBoxDimensions,
7+ viewBoxDimensions = "0 0 120 40" ,
88 style,
99} : {
1010 className ?: string ;
@@ -18,7 +18,7 @@ export const Logo = ({
1818 return (
1919 < div className = "flex items-center" >
2020 < svg
21- viewBox = { viewBoxDimensions || "0 0 120 40" }
21+ viewBox = { viewBoxDimensions }
2222 xmlns = "http://www.w3.org/2000/svg"
2323 preserveAspectRatio = "xMidYMid meet"
2424 fill = "none"
You can’t perform that action at this time.
0 commit comments