Merge pull request 'fix/20210728' (#14) from fix/20210728 into develop

Reviewed-on: #14

.gitattributes

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

asset/scss/_settings.scss

@@ -322,7 +322,7 @@ $button-border: 2px solid $button-color;//1px solid transparent;
 $button-hollow-border-width: 2px;
 $button-sizes: (
   tiny: 0.7rem,
-  small: 0.95rem,
+  small: 0.9rem,
   default: 1.6rem,
   large: 2.4rem,
 );

asset/scss/components/_accordion.scss

@@ -1,11 +1,26 @@
 .accordion-item {
   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 {
   ul,ol {
     list-style: none;
-    //@include flex;
-    //@include flex-align(justify,middle);
     @include xy-grid;
   }
   li {
@@ -14,3 +29,4 @@
     text-align:left;
   }
 }
+

asset/scss/components/_buttons.scss

@@ -1,23 +1,36 @@
 button,.button {
-  &:not(.large,.small,.tiny){
+  &.small{
-    // min-width: 20rem;
+    padding: $global-padding*0.5 $global-padding*1.5;
   }
-    &.primary {
+  &.tiny{
-      color: $white;
+    padding: $global-padding*0.3 $global-padding*1.1;
+  }
+  &:not(.large,.small,.tiny){
+  }
+  &.primary {
+    color: $white;
+  }
+  &.success {
+    border-color: $success-color;
+  }
+  &.alert {
+    border-color: $alert-color;
+    color: $white;
+    &:hover{
+      color:$white;
     }
-    &.success {
+  }
-      border-color: $success-color;
+  &.secondary {
-    }
+    border-color: $secondary-color;
-    &.alert {
+  }
-      border-color: $alert-color;
+  &.inactive {
-      color: $white;
+    color: $light-gray;
-      &:hover{
+    border-color: $light-gray;
-        color:$white;
+    cursor: not-allowed ;
-      }
+    &:hover {
-    }
+      background-color: unset;
-    &.secondary {
-      border-color: $secondary-color;
     }
+  }
 }
 .hero {
   button,.button {

asset/scss/components/_cards.scss

@@ -1,3 +1,31 @@
 .card {
   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';
+        }
+      }
+    }
+  }
+}

asset/scss/components/_forms.scss

@@ -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;
-      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;
-        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%);
-    }
-  }
 }

asset/scss/global/_omeka.scss

@@ -322,12 +322,12 @@ body.vertical-menu header .desktop {
 }
 
 .browse-control-mobile {
-  // display: none;
+   display: none;
-  //
+
-  // @include breakpoint(small down) {
+   @include breakpoint(small down) {
-  //   display: inline-block;
+     display: inline-block;
   //   float: right;
-  // }
+   }
 }
 
 .browse-toggle {
@@ -355,9 +355,9 @@ body.vertical-menu header .desktop {
 }
 
 .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);
   // font-size: .875 * $global-font-size;
   //
@@ -373,19 +373,19 @@ body.vertical-menu header .desktop {
   //   margin-right: .5 * $global-margin;
   // }
   //
-  // @include breakpoint(small down) {
+   @include breakpoint(small down) {
   //   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,
   //   .omeka-pagination,
   //   .advanced-search {
@@ -395,7 +395,14 @@ body.vertical-menu header .desktop {
   //   .advanced-search {
   //     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 {
@@ -507,20 +514,20 @@ body.vertical-menu header .desktop {
 }
 
 .omeka-pagination {
-  // @include breakpoint(medium) {
+   @include breakpoint(medium) {
-  //   @include xy-cell(4);
+     @include xy-cell();
-  // }
+   }
 }
 
 .omeka-pagination,
 .omeka-pagination form {
-  // display: flex;
+   display: flex;
-  // align-items: center;
+   align-items: center;
 }
 
 .omeka-pagination .button-group {
-  // flex-wrap: nowrap;
+   flex-wrap: nowrap;
-  // flex-grow: 0;
+   flex-grow: 0;
 }
 
 .omeka-pagination form,
@@ -538,17 +545,27 @@ body.vertical-menu header .desktop {
 }
 
 .sorting {
-  // display: flex;
+   display: flex;
 }
 
 .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 {

asset/scss/modules/_content.scss

@@ -43,9 +43,8 @@ main {
     }
     section {
       padding: $global-padding $global-padding*2;
-      //margin: $global-margin;
     }
-    .entry-content {
+    .entry-content,.omekas-entry-content {
       @include breakpoint(small){
         @include xy-cell(12);
         padding: $global-padding*2 ;
@@ -69,6 +68,32 @@ main {
 }
 
 
+//
+// page category
+//--------------
+.index{
+  main {
+    article {
+      header {
+        .entry-title {
+        }
+      }
+      section {
+      }
+      .entry-content,.omekas-entry-content {
+        @include breakpoint(small){
+        }
+        @include breakpoint(medium){
+          max-width: unset;
+        }
+        @include breakpoint(xlarge){
+          max-width: unset;
+        }
+      }
+    }
+  }
+}
+
 //
 // news category
 //--------------
@@ -152,12 +177,11 @@ main {
 
 .collections-list {
   @include xy-grid;
-  width:100vw;
+  padding:0;
   header,main{
     @include xy-cell(12);
     @include flex;
     @include flex-align(center,top);
-    padding: $global-padding*2 0;
   }
   header {
     margin-top: 2*$global-margin;
@@ -166,10 +190,15 @@ main {
   }
   main {
     @include xy-grid;
-    article{
+    padding: 0;
+    margin: 0;
+    article {
       @include card-container();
-      @include breakpoint(small){
         @include xy-cell();
+        width: 100%;
+        padding: 0;
+        margin: 0;
+      @include breakpoint(small){
         font-size: $global-font-size*0.7;
       }
       @include breakpoint(medium){
@@ -179,18 +208,18 @@ main {
       }
       margin-bottom:0;
     }
-    table {
-      thead,tbody,tfoot {
-        margin: $global-padding*2;
-      }
-    }
   }
   .accordion-content {
+    padding-top: 0;
     section {
       @include xy-grid;
+      padding-top: 0;
+      padding-bottom: 0;
       @include breakpoint(small){
         figure {
           @include xy-cell(12);
+          margin-left:0;
+          margin-right:0;
         }
         p {
           @include xy-cell(12);
@@ -199,6 +228,7 @@ main {
       @include breakpoint(medium){
         figure {
           @include xy-cell(3);
+          margin-left: 0;
         }
         p {
           @include xy-cell(9);
@@ -368,12 +398,42 @@ main {
     aside {
       background-color: $white;
       flex-direction: column;
-      align-content: center;
+      align-items: center;
       h2 {
         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
 
@@ -382,5 +442,4 @@ main {
     width: 100%;
 
   }
-
 //end omeka specific styles

asset/scss/modules/_footer.scss

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

view/common/block-layout/list-of-sites.phtml

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

view/common/cross-site-search/results.phtml

@@ -11,7 +11,8 @@ $hasResults = false;
 <?php
 $img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($this->site);
 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") {
   $image_height = "300px";

view/common/header-default.phtml

@@ -11,23 +11,23 @@
            title="an arc-hive project"
            alt="arc-hive logo" />
     <?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>
 </main>
 <nav>
   <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>
 </nav>

view/common/hero-collections.phtml

@@ -1,34 +1,34 @@
-<section class="hero omeka">
+<section class="hero omeka collections-all">
   <main class="slides">
     <?php if ($this->themeSetting('logo')): ?>
       <section class="slide">
         <figure>
           <img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
-               alt="<?php echo $site->title(); ?>"
                title="<?php echo $site->title(); ?>"
+               alt="<?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" />
+               alt="arc-hive logo"
+               class="logo" />
         </figure>
     </section>
     <?php endif; ?>
 
   </main>
   <aside>
-    <h2>
+    <h2 class="site-title">
       <a href="<?= $this->site->url() ?>">
         <?= $this->site->title() ?>
       </a>
     </h2>
-    <?php echo $this->partial('common/search-form.phtml'); ?>
+    <nav class="">
-
+      <?php echo $this->partial('common/search-form.phtml'); ?>
+    </nav>
   </aside>
 </section>

view/common/hero-default.phtml

@@ -1,27 +1,28 @@
-<section class="hero omeka">
+<section class="hero omeka collection-single">
   <main class="slides">
     <section class="slide">
         <figure>
-          <img class="arc-page-header-img"
+          <img
                title="an arc-hive project"
-               alt="collection logo" />
+               alt="collection logo"
+               class="arc-page-header-img" />
         </figure>
     </section>
   </main>
   <aside>
-    <h2>
+    <h2 class="site-title">
       <a href="<?= $this->site->url() ?>">
         <?= $this->site->title() ?>
       </a>
     </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>
 </section>

view/common/site-list-entry.phtml

@@ -28,6 +28,7 @@ $summary = $showSummary ? $site->summary() : null;
     </ul>
   </a>
   <aside class="accordion-content" data-tab-content>
+   <section>
     <figure>
       <?php if ($site_meta_values != null): ?>
         <img src="<?= $site_meta_values['thumbnail']; ?>" />
@@ -39,5 +40,6 @@ $summary = $showSummary ? $site->summary() : null;
       <?php endif; ?>
       <a class="button small" href="<?= $site->siteUrl() ?>">View</a>
     </p>
+   </section>
   </aside>
 </li>

view/omeka/site/page/show.phtml

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