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 21 additions and 20 deletions
Showing only changes of commit 43326144af - Show all commits

View File

@ -1,34 +1,34 @@
<section class="hero omeka"> <section class="hero omeka collections-all">
<main class="slides"> <main class="slides">
<?php if ($this->themeSetting('logo')): ?> <?php if ($this->themeSetting('logo')): ?>
<section class="slide"> <section class="slide">
<figure> <figure>
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" <img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
alt="<?php echo $site->title(); ?>"
title="<?php echo $site->title(); ?>" title="<?php echo $site->title(); ?>"
alt="<?php echo $site->title(); ?>"
class="logo" /> class="logo" />
</figure> </figure>
</section> </section>
<?php else: ?> <?php else: ?>
<section class="slide"> <section class="slide">
<!-- <p>ARC-HIVE is a curatorial space that gathers artworks that work in the continuum of biomateriality, from DNA, proteins, and cells to full organisms. They can be manipulation, modification or (re)creation of life and living processes.</p> -->
<figure> <figure>
<img src="<?php echo $this->assetUrl('img/ARC-HIVE-logo.svg');?>" <img src="<?php echo $this->assetUrl('img/ARC-HIVE-logo.svg');?>"
class="logo"
title="an arc-hive project" title="an arc-hive project"
alt="arc-hive logo" /> alt="arc-hive logo"
class="logo" />
</figure> </figure>
</section> </section>
<?php endif; ?> <?php endif; ?>
</main> </main>
<aside> <aside>
<h2> <h2 class="site-title">
<a href="<?= $this->site->url() ?>"> <a href="<?= $this->site->url() ?>">
<?= $this->site->title() ?> <?= $this->site->title() ?>
</a> </a>
</h2> </h2>
<?php echo $this->partial('common/search-form.phtml'); ?> <nav class="">
<?php echo $this->partial('common/search-form.phtml'); ?>
</nav>
</aside> </aside>
</section> </section>

View File

@ -1,27 +1,28 @@
<section class="hero omeka"> <section class="hero omeka collection-single">
<main class="slides"> <main class="slides">
<section class="slide"> <section class="slide">
<figure> <figure>
<img class="arc-page-header-img" <img
title="an arc-hive project" title="an arc-hive project"
alt="collection logo" /> alt="collection logo"
class="arc-page-header-img" />
</figure> </figure>
</section> </section>
</main> </main>
<aside> <aside>
<h2> <h2 class="site-title">
<a href="<?= $this->site->url() ?>"> <a href="<?= $this->site->url() ?>">
<?= $this->site->title() ?> <?= $this->site->title() ?>
</a> </a>
</h2> </h2>
<?php <nav class="">
echo $site->publicNav() <?php
->menu() echo $site->publicNav()
->setPartial('common/foundation-navigation.phtml') ->menu()
->renderPartialWithParams(['layout' => 'dropdown']); ->setPartial('common/foundation-navigation.phtml')
->renderPartialWithParams(['layout' => 'dropdown']);
?>
<?php echo $this->partial('common/search-form.phtml'); ?>
?>
<?php echo $this->partial('common/search-form.phtml'); ?> </nav>
</aside> </aside>
</section> </section>