File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 259259 </div >
260260 {/if }
261261 </Layout .Stack >
262- {:else if $isSmallViewport }
262+ {:else if $isTabletViewport }
263263 <div class =" action-buttons" >
264264 <Layout .Stack direction =" column" gap =" s" >
265265 <DropList show ={$feedback .show } scrollable >
Original file line number Diff line number Diff line change 173173
174174 $ : subNavigation = $page .data .subNavigation ;
175175
176- $ : isProjectPage = $page .route ?.id ?.includes (' project-' );
176+ $ : shouldRenderSidebar = ! $isNewWizardStatusOpen && showSideNavigation ;
177+ $ : hasSidebarSpace = shouldRenderSidebar && ! $isTabletViewport && !! selectedProject ;
177178
178179 $ : {
179180 if ($isSidebarOpen ) {
205206 <Navbar {...navbarProps } bind:sideBarIsOpen ={$isSidebarOpen } bind:showAccountMenu />
206207 {/if }
207208
208- {#if ! $isNewWizardStatusOpen && isProjectPage }
209+ {#if shouldRenderSidebar }
209210 <Sidebar
210211 project ={selectedProject }
211212 progressCard ={getProgressCard ()}
221222 <div
222223 class =" content"
223224 class:has-transition ={showContentTransition }
224- class:icons-content ={state === ' icons' && isProjectPage }
225- class:no-sidebar ={! showSideNavigation }>
225+ class:icons-content ={state === ' icons' && selectedProject }
226+ class:no-sidebar ={! hasSidebarSpace }>
226227 <section class ="main-content" data-test ={showSideNavigation }>
227228 {#if $page .data ?.header }
228229 <div class =" layout-header" >
Original file line number Diff line number Diff line change 334334<CommandCenter />
335335<Shell
336336 showSideNavigation ={page .url .pathname !== ' /' &&
337- ! page ?.params .organization &&
338337 ! page .url .pathname .includes (base + ' /account' ) &&
339338 ! page .url .pathname .includes (base + ' /card' ) &&
340339 ! page .url .pathname .includes (base + ' /onboarding' )}
You can’t perform that action at this time.
0 commit comments