update main branch #47

Merged
jorge merged 166 commits from develop into main 2021-12-01 11:20:13 +01:00
2 changed files with 7 additions and 7 deletions
Showing only changes of commit 2d4eb887be - Show all commits

View File

@ -1,8 +1,8 @@
<div class="top-bar"> <div class="top-bar">
<nav class="top-bar-left"> <nav class="top-bar-left">
<div class="title-bar" data-responsive-toggle="responsive-menu" data-hide-for="large"> <!-- <div class="title-bar" data-responsive-toggle="responsive-menu" data-hide-for="large">
<button class="menu-toggle" type="button" data-toggle="offCanvas" aria-label="<?php echo $this->translate('Menu'); ?>"><i class="fas fa-bars"></i></button> <button class="menu-toggle" type="button" data-toggle="offCanvas" aria-label="<?php echo $this->translate('Menu'); ?>"><i class="fas fa-bars"></i></button>
</div> </div> -->
<?php if ($this->themeSetting('logo')): ?> <?php if ($this->themeSetting('logo')): ?>
<a href="<?php echo $site->url(); ?>" class="site-title"><img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" alt="<?php echo $site->title(); ?>" title="<?php echo $site->title(); ?>"></a> <a href="<?php echo $site->url(); ?>" class="site-title"><img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" alt="<?php echo $site->title(); ?>" title="<?php echo $site->title(); ?>"></a>
@ -13,8 +13,8 @@
</nav> </nav>
<div class="top-bar-right" id="responsive-menu"> <div class="top-bar-right" id="responsive-menu">
<?php echo $site->publicNav()->menu()->setPartial('common/foundation-navigation.phtml')->renderPartialWithParams(['layout' => 'dropdown']); ?> <?php echo $site->publicNav()->menu()->setPartial('common/foundation-navigation.phtml')->renderPartialWithParams(['layout' => 'dropdown']); ?>
<div class="search"> <!-- <div class="search"> -->
<?php echo $this->partial('common/search-form'); ?> <?php //echo $this->partial('common/search-form'); ?>
</div> <!-- </div> -->
</div> </div>
</div> </div>

View File

@ -64,9 +64,9 @@ endif;
<?php //echo $titlelogo; ?> <?php //echo $titlelogo; ?>
<!-- </a> --> <!-- </a> -->
<h1 id="archive_page_title" <!-- <h1 id="archive_page_title"
class="archive-page-title"> class="archive-page-title">
</h1> </h1> -->
<?php <?php
//echo $page; //echo $page;