Deltacms/Deltacms
Deltacms
/
Deltacms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

déplacement de normalize et largeur du menu si bannière limitée au site

This commit is contained in:
Deltacms 2023-02-17 18:29:56 +01:00
parent 88018e4ee8
commit a433f8f4e6
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -110,7 +110,7 @@ class common {
// chargement des scripts et des styles dans head // chargement des scripts et des styles dans head
'vendor' => [ 'vendor' => [
'jquery', 'jquery',
'normalize', //'normalize', chargé dans main.php avant common.css
'lity', 'lity',
'filemanager', 'filemanager',
'tippy', 'tippy',

1
core/layout/blank.php
View File

@ -7,6 +7,7 @@
$this->showMetaTitle(); $this->showMetaTitle();
?> ?>
<base href="<?php echo helper::baseUrl(true); ?>"> <base href="<?php echo helper::baseUrl(true); ?>">
<link rel="stylesheet" href="core/vendor/normalize/normalize.min.css">
<link rel="stylesheet" href="core/layout/common.css"> <link rel="stylesheet" href="core/layout/common.css">
<link rel="stylesheet" href="core/layout/mediaqueries.css"> <link rel="stylesheet" href="core/layout/mediaqueries.css">
<link rel="stylesheet" href="core/layout/blank.css"> <link rel="stylesheet" href="core/layout/blank.css">

1
core/layout/light.php
View File

@ -7,6 +7,7 @@
$this->showMetaTitle(); $this->showMetaTitle();
?> ?>
<base href="<?php echo helper::baseUrl(true); ?>"> <base href="<?php echo helper::baseUrl(true); ?>">
<link rel="stylesheet" href="core/vendor/normalize/normalize.min.css">
<link rel="stylesheet" href="core/layout/common.css"> <link rel="stylesheet" href="core/layout/common.css">
<link rel="stylesheet" href="core/layout/mediaqueries.css"> <link rel="stylesheet" href="core/layout/mediaqueries.css">
<link rel="stylesheet" href="core/layout/light.css"> <link rel="stylesheet" href="core/layout/light.css">

20
core/layout/main.php
View File

@ -14,6 +14,7 @@ else { echo '<html lang="'.$lang.'">'; }
if( $this->getData(['config', 'social', 'headFacebook' ]) === true) $this->showMetaPropertyFacebook(); if( $this->getData(['config', 'social', 'headFacebook' ]) === true) $this->showMetaPropertyFacebook();
?> ?>
<base href="<?php echo helper::baseUrl(true); ?>"> <base href="<?php echo helper::baseUrl(true); ?>">
<link rel="stylesheet" href="core/vendor/normalize/normalize.min.css">
<link rel="stylesheet" href="core/layout/common.css"> <link rel="stylesheet" href="core/layout/common.css">
<link rel="stylesheet" href="core/layout/mediaqueries.css"> <link rel="stylesheet" href="core/layout/mediaqueries.css">
<link rel="stylesheet" href="<?php echo self::DATA_DIR; ?>theme.css"> <link rel="stylesheet" href="<?php echo self::DATA_DIR; ?>theme.css">
@ -145,20 +146,23 @@ else { echo '<html lang="'.$lang.'">'; }
<?php endif; ?> <?php endif; ?>
<!-- Menu dans le fond du site après la bannière --> <!-- Menu dans le fond du site après la bannière -->
<?php if($this->getData(['theme', 'menu', 'position']) === 'body-second'): ?> <?php if( $this->getData(['theme', 'menu', 'position']) === 'body-second' ):
// Menu dans le fond du site après la bannière et bannière limitée au site
<nav> $navStyle = 'toto';
if( $this->getData(['theme', 'header', 'position'])==='body' && $this->getData(['theme', 'header', 'wide'])==='container' ){
$navStyle = 'style="max-width:'. $this->getData(['theme', 'site', 'width']) . '; display: block; margin: auto;"';
}
?>
<nav <?php echo $navStyle; ?> >
<!-- Menu burger --> <!-- Menu burger -->
<div id="toggle"> <div id="toggle">
<?php echo $this->getData(['theme','menu','burgerContent']) === 'title' ? '<div class="notranslate" id="burgerText">' . $this->getData(['locale', 'title']) . '</div>' : '' ;?> <?php echo $this->getData(['theme','menu','burgerContent']) === 'title' ? '<div class="notranslate" id="burgerText">' . $this->getData(['locale', 'title']) . '</div>' : '' ;?>
<?php echo $this->getData(['theme','menu','burgerContent']) === 'logo' ? '<div class="notranslate" id="burgerLogo"><img src="'. $fileLogo .'" width="'. $widthLogo.'" height="'. $heightLogo .'"></div>' : '' ;?> <?php echo $this->getData(['theme','menu','burgerContent']) === 'logo' ? '<div class="notranslate" id="burgerLogo"><img src="'. $fileLogo .'" width="'. $widthLogo.'" height="'. $heightLogo .'"></div>' : '' ;?>
<?php echo template::ico('menu',null,null,'2em'); ?></div> <?php echo template::ico('menu',null,null,'2em'); ?></div>
<!-- fin du menu burger --> <!-- fin du menu burger -->
<?php <?php
$menuClass = $this->getData(['theme', 'menu', 'wide']) === 'none' ? 'class="container-large"' : 'class="container"'; $menuClass = $this->getData(['theme', 'menu', 'wide']) === 'none' ? 'class="container-large"' : 'class="container"';
?> ?> <div id="menu" <?php echo $menuClass; ?> > <?php $this->showMenu(); ?> </div>
<div id="menu" <?php echo $menuClass; ?> >
<?php $this->showMenu(); ?></div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>