several improvements and fixes

master
Harald Wolff 2021-11-17 13:23:49 +01:00
parent 003e6c6515
commit 554f7ca8c8
1 changed files with 8 additions and 6 deletions

View File

@ -72,6 +72,8 @@ $this->addStyleDeclaration(':root {
--bs-background-content-rgb: ' . hex2rgb($params->get('colorContentBackground')) . ';
--bs-background-content-opacity: ' .$params->get('colorContentBackgroundOpacity') . ';
--bs-h1: ' . $params->get('colorH1') . ';
}');
if (!$params->get('solidTopSides')) {
@ -100,11 +102,11 @@ if (!$params->get('solidTopLogo')) {
<jdoc:include type="modules" name="above" style="html5" />
</section><?php endif; ?>
<header id="header" class="container-fluid sticky-top px-0">
<header id="header" class="container-fluid sticky-top px-0 mb-2">
<!--div class="" id="topleft"><jdoc:include type="modules" name="topleft" style="html5" /></div-->
<div class="container bg-header clearfix">
<?php if ($sitelogo): ?><img class="float-start" src="<?php echo $sitelogo;?>"><?php endif; ?>
<div class="container bg-header clearfix align-middle">
<?php if ($sitelogo): ?><a href="/"><img class="float-start m-1" src="<?php echo $sitelogo;?>" style="<?php if ($params->get('site-logo-x')) echo 'width: '.$params->get('site-logo-x') . '; '; ?><?php if ($params->get('site-logo-y')) echo 'height: '.$params->get('site-logo-y') . '; '; ?>"></a><?php endif; ?>
<jdoc:include type="modules" name="top" style="html5" />
<!--div class="container" id="top"></div-->
</div>
@ -126,11 +128,11 @@ if (!$params->get('solidTopLogo')) {
<jdoc:include type="modules" name="message" style="html5" />
</section><?php endif; ?>
<main>
<section id="component">
<?php if ($cntLeft): ?><section id="left" class="float-lg-start float-none bg-content p-2 border-1 w-25 "><jdoc:include type="modules" name="left" style="html5" /></section><?php endif;?>
<?php if ($cntRight): ?><section id="right" class="float-lg-end float-none bg-content p-2 border-1 w-25"><jdoc:include type="modules" name="right" style="html5" /></section><?php endif;?>
<section id="component" class="clearfix">
<jdoc:include type="component" />
</section>
<?php if ($cntLeft): ?><section id="left"><jdoc:include type="modules" name="left" style="html5" /></section><?php endif;?>
<?php if ($cntRight): ?><section id="right"><jdoc:include type="modules" name="right" style="html5" /></section><?php endif;?>
</main>
</section>
<section id="filler" class="spacer"></section>