Skip to content

Commit fe6a000

Browse files
committed
fix:added support for tablet too
1 parent a0724d5 commit fe6a000

File tree

1 file changed

+60
-28
lines changed

1 file changed

+60
-28
lines changed

src/lib/components/sidebar.svelte

Lines changed: 60 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</Link.Button>
125125
</div>
126126
</div>
127-
<div slot="middle" class:icons={state === 'icons'}>
127+
<div slot="middle" class="middle-container" class:icons={state === 'icons'}>
128128
{#if progressCard}
129129
<Tooltip placement="right" disabled={state !== 'icons'}>
130130
<a
@@ -240,26 +240,27 @@
240240
<span slot="tooltip">{projectOption.name}</span>
241241
</Tooltip>
242242
{/each}
243-
<div class="only-mobile divider">
244-
<Divider />
245-
</div>
246-
<div class="only-mobile">
247-
<Tooltip placement="right" disabled={state !== 'icons'}>
248-
<a
249-
href={`/console/project-${project.region}-${project.$id}/settings`}
250-
on:click={() => {
251-
trackEvent('click_menu_settings');
252-
}}
253-
class="link"
254-
><span class="link-icon"><Icon icon={IconCog} size="s" /></span
255-
><span
256-
class:no-text={state === 'icons'}
257-
class:has-text={state === 'open'}
258-
class="link-text">Settings</span
259-
></a>
260-
<span slot="tooltip">Settings</span>
261-
</Tooltip>
262-
</div>
243+
{#if project}
244+
<div class="mobile-tablet-settings">
245+
<Tooltip placement="right" disabled={state !== 'icons'}>
246+
<a
247+
href={`/console/project-${project.region}-${project.$id}/settings`}
248+
on:click={() => {
249+
trackEvent('click_menu_settings');
250+
sideBarIsOpen = false;
251+
}}
252+
class="link"
253+
class:active={false}
254+
><span class="link-icon"><Icon icon={IconCog} size="s" /></span
255+
><span
256+
class:no-text={state === 'icons'}
257+
class:has-text={state === 'open'}
258+
class="link-text">Settings</span
259+
></a>
260+
<span slot="tooltip">Settings</span>
261+
</Tooltip>
262+
</div>
263+
{/if}
263264
</Layout.Stack>
264265
{:else if $isSmallViewport}
265266
<div class="action-buttons">
@@ -308,7 +309,7 @@
308309
on:click={() => {
309310
trackEvent('click_menu_settings');
310311
}}
311-
class:active={isSelected('/settings') && !isSelected('sites')}
312+
class:active={false}
312313
><span class="link-icon"><Icon icon={IconCog} size="s" /></span><span
313314
class:no-text={state === 'icons'}
314315
class:has-text={state === 'open'}
@@ -359,6 +360,43 @@
359360
{/if}
360361

361362
<style lang="scss">
363+
.middle-container {
364+
flex: 1;
365+
overflow-y: visible;
366+
max-height: none;
367+
}
368+
.bottom {
369+
position: sticky;
370+
bottom: 0;
371+
background: var(--bgcolor-neutral-primary, #fff);
372+
border-top: 1px solid var(--border-neutral, #ededf0);
373+
padding-top: var(--space-4, 8px);
374+
z-index: 10;
375+
376+
@media (min-width: 1024px) {
377+
height: var(--base-32, 32px);
378+
border-top: none;
379+
padding-top: 0;
380+
position: static;
381+
}
382+
}
383+
.mobile-tablet-settings {
384+
display: block;
385+
margin-top: var(--space-6, 12px);
386+
387+
&::before {
388+
content: '';
389+
display: block;
390+
height: 1px;
391+
background: var(--border-neutral, #ededf0);
392+
margin-bottom: var(--space-6, 12px);
393+
}
394+
395+
@media (min-width: 1024px) {
396+
display: none;
397+
}
398+
}
399+
362400
.link {
363401
display: flex;
364402
height: 32px;
@@ -578,12 +616,6 @@
578616
width: 100%;
579617
}
580618
581-
.bottom {
582-
@media (min-width: 1024px) {
583-
height: var(--base-32, 32px);
584-
}
585-
}
586-
587619
:global(button.collapse) {
588620
transform: translateX(-10px);
589621
}

0 commit comments

Comments
 (0)