Skip to content

Commit 201910f

Browse files
committed
Fix inconsistent Turbo Frame indentation
1 parent 3fa8abe commit 201910f

2 files changed

Lines changed: 29 additions & 10 deletions

File tree

public/styles/panel/main.css

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,25 @@ button.action-icon:active svg {
255255
--minimum-base-padding: 0.5rem;
256256
padding-left: calc(var(--depth, 0) * var(--indent-size) + var(--minimum-base-padding));
257257
}
258-
.entry-row.leaf-node {
259-
--indent-size: 1.5rem;
258+
/* Tree row layout for turbo frame pane */
259+
.entry-row.tree-row {
260+
--tree-indent-size: 1rem;
261+
--tree-toggle-width: 1.25rem;
262+
padding-left: 0.25rem;
263+
border-left: 3px solid transparent;
264+
}
265+
266+
.tree-indent {
267+
display: inline-block;
268+
flex-shrink: 0;
269+
}
270+
271+
.tree-toggle {
272+
display: inline-flex;
273+
align-items: center;
274+
justify-content: center;
275+
width: var(--tree-toggle-width);
276+
flex-shrink: 0;
260277
}
261278
.entry-row.detail-sub-row {
262279
padding-left: calc(var(--depth, 1) * 1rem + 0.5rem);
@@ -288,6 +305,9 @@ button.action-icon:active svg {
288305
background-color: var(--wa-color-brand-fill-normal);
289306
border-left: 3px solid var(--wa-color-brand-fill-loud);
290307
}
308+
.entry-row.tree-row.selected {
309+
border-left-color: var(--wa-color-brand-fill-loud);
310+
}
291311

292312
.entry-row .btn-hoverable {
293313
opacity: 0;

src/browser_panel/panel/tabs/TurboTab.svelte

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,10 @@
328328
{@const selector = `#${frame.id}`}
329329
{@const hasChildren = frame.children && frame.children.length > 0}
330330
{@const isCollapsed = collapsedFrames[frame.uuid] || false}
331-
{@const isLeafNode = !hasChildren && depth > 0}
332-
333331
<div
334-
class="d-flex justify-content-between align-items-center cursor-pointer entry-row"
332+
class="d-flex justify-content-between align-items-center cursor-pointer entry-row tree-row"
335333
class:selected={selected.type === SELECTABLE_TYPES.TURBO_FRAME && selected.frame.id === frame.id}
336334
class:with-children={hasChildren}
337-
class:leaf-node={isLeafNode}
338-
class:ps-0={hasChildren && depth === 0}
339335
role="button"
340336
tabindex="0"
341337
style="--depth: {depth}"
@@ -346,9 +342,12 @@
346342
onmouseleave={() => hideHighlightOverlay()}
347343
>
348344
<div class="d-flex align-items-center">
349-
{#if hasChildren}
350-
<IconButton class="collapse-icon {isCollapsed ? 'rotated' : ''}" name="chevron-down" onclick={(event) => collapseEntryRows(frame.uuid, event, collapsedFrames, stickyFrames)}></IconButton>
351-
{/if}
345+
<span class="tree-indent" style="width: calc(var(--depth) * var(--tree-indent-size))"></span>
346+
<span class="tree-toggle">
347+
{#if hasChildren}
348+
<IconButton class="collapse-icon {isCollapsed ? 'rotated' : ''}" name="chevron-down" onclick={(event) => collapseEntryRows(frame.uuid, event, collapsedFrames, stickyFrames)}></IconButton>
349+
{/if}
350+
</span>
352351
<StripedHtmlTag element={frame} />
353352
{#if !frame.hasUniqueId}
354353
<wa-tooltip for={`unique-id-warning-icon-${frame.uuid}`}>Warning: Multiple &lt;turbo-frame&gt; elements share the same ID</wa-tooltip>

0 commit comments

Comments
 (0)