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 20 additions and 17 deletions
Showing only changes of commit 188e8c9c93 - Show all commits

View File

@ -0,0 +1,16 @@
<section class="hero omeka">
<main class="slides">
<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>
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" alt="<?php echo $site->title(); ?>" title="<?php echo $site->title(); ?>" class="logo">
</figure>
</section>
</main>
<aside>
<h2>collections</h2>
<?php echo $this->partial('common/search-form.phtml'); ?>
</aside>
</section>

View File

@ -55,26 +55,13 @@ endif;
<?php echo $this->partial('common/header-archive'); ?> <?php echo $this->partial('common/header-archive'); ?>
</header> </header>
<section class="hero omeka"> <?php echo $this->partial('common/hero-archive.phtml'); ?>
<main class="slides">
<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>
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" alt="<?php echo $site->title(); ?>" title="<?php echo $site->title(); ?>" class="logo">
</figure>
</section>
</main>
<aside>
<h2>collections</h2>
<?php echo $this->partial('common/search-form.phtml'); ?>
</aside>
</section>
<main> <main>
<article> <article>
<section class="omekas-entry-content">
<?php echo $this->content; ?> <?php echo $this->content; ?>
</section>
</article> </article>
<aside> <aside>
</aside> </aside>