Skip to content

Commit 0a94f99

Browse files
authored
Merge pull request #19 from encryption4all/fix/impersonation-banner-scroll
fix: keep impersonation banner inside viewport layout
2 parents 9c1097f + e08cd8e commit 0a94f99

2 files changed

Lines changed: 20 additions & 2 deletions

File tree

src/routes/(admin)/+layout.svelte

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
]);
2323
</script>
2424

25+
<div class="layout-shell">
2526
{#if data.impersonatingOrgId}
2627
<div class="impersonation-bar">
2728
<Icon icon="mdi:eye" width="16" height="16" />
@@ -83,6 +84,7 @@
8384
</div>
8485
</div>
8586
</div>
87+
</div>
8688

8789
{#if sidebarOpen}
8890
<div class="sidebar-overlay desktop-hide" role="presentation" onclick={() => (sidebarOpen = false)}></div>
@@ -115,11 +117,18 @@
115117
&:hover { background: rgba(255, 255, 255, 0.3); }
116118
}
117119
118-
.admin-layout {
120+
.layout-shell {
119121
display: flex;
122+
flex-direction: column;
120123
min-height: 100vh;
121124
}
122125
126+
.admin-layout {
127+
display: flex;
128+
flex: 1;
129+
min-height: 0;
130+
}
131+
123132
.sidebar {
124133
width: 240px;
125134
background: var(--pg-soft-background);

src/routes/(portal)/+layout.svelte

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
]);
2929
</script>
3030

31+
<div class="layout-shell">
3132
{#if data.isImpersonating}
3233
<div class="impersonation-bar">
3334
<Icon icon="mdi:eye" width="16" height="16" />
@@ -89,6 +90,7 @@
8990
</div>
9091
</div>
9192
</div>
93+
</div>
9294

9395
{#if sidebarOpen}
9496
<div class="sidebar-overlay desktop-hide" role="presentation" onclick={() => (sidebarOpen = false)}></div>
@@ -125,11 +127,18 @@
125127
}
126128
}
127129
128-
.portal {
130+
.layout-shell {
129131
display: flex;
132+
flex-direction: column;
130133
min-height: 100vh;
131134
}
132135
136+
.portal {
137+
display: flex;
138+
flex: 1;
139+
min-height: 0;
140+
}
141+
133142
.sidebar {
134143
width: 260px;
135144
background: var(--pg-soft-background);

0 commit comments

Comments
 (0)