update main branch #47

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

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
default.css merge=ours

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

View File

@ -1,5 +1,22 @@
.accordion-item { .accordion-item {
border-bottom: $global-border-archive; border-bottom: $global-border-archive;
&:first-of-type {
max-height: 5rem;
.is-active{
max-height: 5rem;
padding:0;
}
.accordion-title::before{
content:'';
}
a {
color: black;
&:hover,&:active,&:focus{
color: black;
cursor: not-allowed;
}
}
}
} }
.accordion-title { .accordion-title {
ul,ol { ul,ol {
@ -12,3 +29,4 @@
text-align:left; text-align:left;
} }
} }

View File

@ -23,6 +23,14 @@ button,.button {
&.secondary { &.secondary {
border-color: $secondary-color; border-color: $secondary-color;
} }
&.inactive {
color: $light-gray;
border-color: $light-gray;
cursor: not-allowed ;
&:hover {
background-color: unset;
}
}
} }
.hero { .hero {
button,.button { button,.button {

View File

@ -1,3 +1,31 @@
.card { .card {
padding: $global-padding; padding: $global-padding;
} }
.collection-card {
ul {
&.arc-site-meta {
list-style: none;
margin: $global-margin 0;
li {
&:before{
content:'';
display: inline-block;
width: rem-calc(150);
min-height: rem-calc($global-lineheight);
}
&.artist:before {
content:'Artist';
}
&.date:before {
content: 'Year';
}
&.collection:before {
content: 'Collection';
}
&.tech-document-link:before {
content: 'Keywords';
}
}
}
}
}

View File

@ -1,66 +1,67 @@
.search{ .hero{
.input-group * { .search{
margin: 0; .input-group * {
} margin: 0;
.input-group {
position: relative;
border-radius: 4rem;
overflow: hidden;
padding: 0;
margin: 0;
}
.input-group .appear {
right: 0;
position: absolute;
height: 100%;
padding: 0.3rem 1rem;
}
.button{
border-color: $primary-color;
}
.appear{
display:none;
}
input{
&:active{
border-color: $primary-color;
background-color: $input-background-focus;
} }
&:focus,&:focus-within{ .input-group {
border-color: $primary-color;
background-color: $input-background;
}
&:not(:placeholder-shown) {
border:none;
background-color: $input-background-focus;
position: relative; position: relative;
right: 2rem; border-radius: 4rem;
+ .appear { overflow: hidden;
display: block; padding: 0;
color: $primary-color; margin: 0;
}
.input-group .appear {
right: 0;
position: absolute;
height: 100%;
padding: 0.3rem 1rem;
}
.button{
border-color: $primary-color;
}
.appear{
display:none;
}
input{
&:active{
border-color: $primary-color;
background-color: $input-background-focus; background-color: $input-background-focus;
z-index: 2; }
&:hover { &:focus,&:focus-within{
color: $white; border-color: $primary-color;
background-color: $primary-color; background-color: $input-background;
} }
&:not(:placeholder-shown) {
border:none;
background-color: $input-background-focus;
position: relative;
right: 2rem;
+ .appear {
display: block;
background-color: scale-color($input-background-focus, $lightness: -20%);
z-index: 2;
&:hover {
color: $white;
background-color: $primary-color;
}
}
}
}
.hollow {
border-color: $primary-color;
color: $primary-color;
&::after {
}
&::placeholder {
color: scale-color($primary-color, $lightness: -20%);
}
&:hover {
background-color: scale-color($primary-color, $lightness: 95%);
}
&:active {
background-color: scale-color($primary-color, $lightness: 85%);
} }
} }
} }
.hollow {
border-color: $primary-color;
color: $primary-color;
&::after {
}
&::placeholder {
color: scale-color($primary-color, $lightness: -20%);
}
&:hover {
background-color: scale-color($primary-color, $lightness: 95%);
}
&:active {
background-color: scale-color($primary-color, $lightness: 85%);
}
}
} }

View File

@ -322,12 +322,12 @@ body.vertical-menu header .desktop {
} }
.browse-control-mobile { .browse-control-mobile {
// display: none; display: none;
//
// @include breakpoint(small down) { @include breakpoint(small down) {
// display: inline-block; display: inline-block;
// float: right; // float: right;
// } }
} }
.browse-toggle { .browse-toggle {
@ -355,9 +355,9 @@ body.vertical-menu header .desktop {
} }
.browse-controls { .browse-controls {
// @include xy-grid; @include xy-grid;
// justify-content: space-between; justify-content: space-between;
// align-items: center; align-items: center;
// margin: 0 (-.5 * $global-margin); // margin: 0 (-.5 * $global-margin);
// font-size: .875 * $global-font-size; // font-size: .875 * $global-font-size;
// //
@ -373,19 +373,19 @@ body.vertical-menu header .desktop {
// margin-right: .5 * $global-margin; // margin-right: .5 * $global-margin;
// } // }
// //
// @include breakpoint(small down) { @include breakpoint(small down) {
// margin: 0; // margin: 0;
// display: none; display: none;
//
// &.open { &.open {
// display: flex; display: flex;
// align-items: stretch; align-items: stretch;
// } }
//
// &.closed { &.closed {
// display: none; display: none;
// } }
//
// .sorting, // .sorting,
// .omeka-pagination, // .omeka-pagination,
// .advanced-search { // .advanced-search {
@ -395,7 +395,14 @@ body.vertical-menu header .desktop {
// .advanced-search { // .advanced-search {
// order: 3; // order: 3;
// } // }
// } }
.button-group {
margin-bottom: 0;
}
button,.button{
font-size: $global-font-size * 0.9;
padding: $global-padding*0.7 $global-padding*1.7;
}
} }
.filter { .filter {
@ -507,20 +514,20 @@ body.vertical-menu header .desktop {
} }
.omeka-pagination { .omeka-pagination {
// @include breakpoint(medium) { @include breakpoint(medium) {
// @include xy-cell(4); @include xy-cell();
// } }
} }
.omeka-pagination, .omeka-pagination,
.omeka-pagination form { .omeka-pagination form {
// display: flex; display: flex;
// align-items: center; align-items: center;
} }
.omeka-pagination .button-group { .omeka-pagination .button-group {
// flex-wrap: nowrap; flex-wrap: nowrap;
// flex-grow: 0; flex-grow: 0;
} }
.omeka-pagination form, .omeka-pagination form,
@ -538,17 +545,27 @@ body.vertical-menu header .desktop {
} }
.sorting { .sorting {
// display: flex; display: flex;
} }
.sorting select { .sorting select {
// width: 100%; width: 100%;
// height: 100%; height: 100%;
// margin-bottom: 0; margin-bottom: 0;
} }
.sorting button { .sorting {
// margin-bottom: 0; display: flex;
button,.button {
padding: 0 $global-padding*1.4;
font-size: $global-font-size * 0.85;
margin: 0 $global-margin;
}
select {
// width: 100%;
// height: 100%;
margin-bottom: 0;
}
} }
.layout-toggle button { .layout-toggle button {

View File

@ -188,7 +188,7 @@ main {
article { article {
@include card-container(); @include card-container();
@include xy-cell(); @include xy-cell();
width: 100%; width: 100%;
padding: 0; padding: 0;
margin: 0; margin: 0;
@include breakpoint(small){ @include breakpoint(small){
@ -211,7 +211,6 @@ main {
@include breakpoint(small){ @include breakpoint(small){
figure { figure {
@include xy-cell(12); @include xy-cell(12);
background-color: $light-gray;
margin-left:0; margin-left:0;
margin-right:0; margin-right:0;
} }
@ -392,12 +391,42 @@ main {
aside { aside {
background-color: $white; background-color: $white;
flex-direction: column; flex-direction: column;
align-content: center; align-items: center;
h2 { h2 {
margin: $global-margin; margin: $global-margin;
} }
} }
} }
&.collections-all {
}
&.collection-single {
.slides{
background-color: unset;
.slide {
margin:0 auto;
height: unset;
width: 100vw;
max-height: 10rem;
@include breakpoint(large){
height: unset;
}
img,.arc-page-header-img {
background-repeat: no-repeat;
background-size: contain;
width: 100vw;
}
}
}
aside {
nav {
width: 100vw;
border-top: $global-border-archive;
border-bottom: $global-border-archive;
margin: 0;
}
}
}
} }
//end hero //end hero

View File

@ -1,4 +1,5 @@
footer { footer {
margin-top: $global-margin;
background-color: $secondary-color; background-color: $secondary-color;
a { a {
color: $body-font-color; color: $body-font-color;
@ -24,7 +25,7 @@ footer {
.logo { .logo {
} }
.site-brand,.brand-logo { .site-brand,.brand-logo {
&.archive{ &.archive,&.arc-hive{
&::before { &::before {
margin-top:unset; margin-top:unset;
} }
@ -32,7 +33,6 @@ footer {
&.eu { &.eu {
&::before { &::before {
@include breakpoint(small) { @include breakpoint(small) {
// background-image: url('../img/eu_flag_creative_europe_co_funded_black_right.svg');
background-position-x: right; background-position-x: right;
max-width: 50vw; max-width: 50vw;
margin-top:unset; margin-top:unset;
@ -59,7 +59,6 @@ footer {
padding: $global-padding; padding: $global-padding;
font-size: $global-font-size * 0.8; font-size: $global-font-size * 0.8;
&:first-child { &:first-child {
//padding-top: $global-padding*3;
} }
.co-founded { .co-founded {
text-align:right; text-align:right;

View File

@ -1,4 +1,8 @@
<?php <?php
//
// as for 2021 07 28 this template is not being used
// consider deleting it
//
$archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta'); $archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta');
?> ?>

View File

@ -11,7 +11,8 @@ $hasResults = false;
<?php <?php
$img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($this->site); $img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($this->site);
if (!$img_src) { if (!$img_src) {
$img_src = '/themes/archive/asset/img/default-header-image.jpg'; //$img_src = '/themes/archive/asset/img/default-header-image.jpg';
$img_src = $this->assetUrl('img/ARC-HIVE-logo.svg');
} }
if ($this->site->title() == "Collections") { if ($this->site->title() == "Collections") {
$image_height = "300px"; $image_height = "300px";

View File

@ -11,23 +11,23 @@
title="an arc-hive project" title="an arc-hive project"
alt="arc-hive logo" /> alt="arc-hive logo" />
<?php endif; ?> <?php endif; ?>
<h1 class="site-name"><?php echo $site->title(); ?></h1> <h1 class="site-name">
<h2 class="site-description">an integrative digital bio-art platform</h2> <?php echo $site->title(); ?>
</h1>
<h2 class="site-description">
an integrative digital bio-art platform
</h2>
</a> </a>
</main> </main>
<nav> <nav>
<menu class=""> <menu class="">
<ul> <?php //
<li> // Segun el diseño, este menu no existe
Segun el diseño, este menu no existe // ----------
</li> // echo $site->publicNav()
</ul> // ->menu()
<?php /* // ->setPartial('common/foundation-navigation.phtml')
echo $site->publicNav() // ->renderPartialWithParams(['layout' => 'dropdown']);
->menu()
->setPartial('common/foundation-navigation.phtml')
->renderPartialWithParams(['layout' => 'dropdown']);
*/
?> ?>
</menu> </menu>
</nav> </nav>

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>

View File

@ -11,7 +11,7 @@ $showPagePagination = $this->siteSetting('show_page_pagination', true);
$img_src = null; $img_src = null;
$img_src = $this->getHelperPluginManager()->get('headerImage')->getImage($page); $img_src = $this->getHelperPluginManager()->get('headerImage')->getImage($page);
if (!$img_src) { if (!$img_src) {
$img_src = $this->assetUrl('img/ARC-HIVE-logo.svg'); $img_src = $this->assetUrl('img/default-ARC-HIVE-hero-image.jpg');
} }
?> ?>
<style> <style>