update main branch #47

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

File diff suppressed because one or more lines are too long

View File

@ -331,6 +331,7 @@ main {
align-content: center;
align-self: center;
margin: $global-margin auto;
justify-content: center;
&:first-child {
color: unset;
background-color: unset;

View File

@ -1,17 +1,13 @@
<main class="">
<?php if ($this->themeSetting('logo')): ?>
<a href="<?php echo $site->url(); ?>" class="site-brand arc-hive-off">
<?php if ($this->themeSetting('logo')): ?>
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" alt="<?php echo $site->title(); ?>" title="<?php echo $site->title(); ?>" class="logo">
<?php else: ?>
<img src="<?php echo $this->assetUrl('img/ARC-HIVE-logo.svg');?>" class="logo" title="an arc-hive project" alt="arc-hive logo" />
<?php endif; ?>
<h1 class="site-name"><?php echo $site->title(); ?></h1>
<h2 class="site-description">an integrative digital bio-art platform</h2>
</a>
<?php else: ?>
<a href="<?php echo $site->url(); ?>" role="banner" class="site-brand">
<h1 class="site-name-show"><?php echo $this->pageTitle($site->title()); ?></h1>
<h2 class="site-description-show">an integrative digital bio-art platform</h2>
</a>
<?php endif; ?>
</main>
<nav>
<menu class="">

View File

@ -1,11 +1,19 @@
<section class="hero omeka">
<main class="slides">
<?php if ($this->themeSetting('logo')): ?>
<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">
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" alt="<?php echo $site->title(); ?>" title="<?php echo $site->title(); ?>" class="logo" />
</figure>
</section>
<?php else: ?>
<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->assetUrl('img/ARC-HIVE-logo.svg');?>" class="logo" title="an arc-hive project" alt="arc-hive logo" />
</figure>
</section>
<?php endif; ?>
</main>
<aside>
<h2>collections</h2>