fix(layout): restore Zibll float dual-column so content no longer overlaps sidebar

Align main shells to main.container > .content-wrap + .sidebar siblings, drop
content-shell padding on dual-column hosts, and remove route flex overrides that
disabled the negative-margin sidebar math.
This commit is contained in:
2026-07-22 21:05:12 +08:00
parent 79bc4159f5
commit 7d33097209
15 changed files with 156 additions and 172 deletions
+8 -3
View File
@@ -415,7 +415,14 @@ if (!function_exists('aksrt_archive_open_shell')) :
'page_kind' => 'archive',
]);
// Force container; strip content-shell* so float dual-column is not padded/max-width nested.
$main_class = trim((string) $args['main_class']);
if ($main_class === '') {
$main_class = 'site-main container';
} elseif (strpos($main_class, 'container') === false) {
$main_class .= ' container';
}
$main_class = trim((string) preg_replace('/\bcontent-shell(?:--[a-z0-9-]+)?\b/i', '', $main_class));
?>
<main id="main-content" class="<?php echo esc_attr($main_class); ?>" tabindex="-1">
<?php
@@ -424,8 +431,7 @@ if (!function_exists('aksrt_archive_open_shell')) :
}
?>
<div class="content-wrap">
<div class="content-layout<?php echo !empty($args['has_sidebar']) ? '' : ' content-layout--no-sidebar'; ?>">
<div class="content-layout__primary">
<div class="content-layout">
<?php
}
endif;
@@ -443,7 +449,6 @@ if (!function_exists('aksrt_archive_close_shell')) :
'bottom_fluid' => [],
]);
?>
</div>
</div>
</div>
<?php if (!empty($args['has_sidebar'])) : ?>