Merge pull request 'fix/index-sites-items-issue-35' (#36) from fix/index-sites-items-issue-35 into develop

Reviewed-on: #36

asset/scss/components/_buttons.scss

@@ -1,3 +1,6 @@
+button {
+  @extend .button;
+}
 button,.button {
   &.small{
     padding: $global-padding*0.5 $global-padding*1.5;
@@ -58,3 +61,9 @@ button,.button {
     border: none;
   }
 }
+.end_of_page_button {
+  @extend .button.small;
+  display: flex;
+  margin:  $global-margin auto;
+  padding: $global-padding*0.5 $global-padding*5;
+}

asset/scss/components/_cards.scss

@@ -1,3 +1,41 @@
 .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';
+          display:inline;
+          width: 0;
+        }
+        &.tech-document-link {
+          a {
+            @include button;
+            padding: $global-padding*0.5 $global-padding*1.5;
+            margin-left: 0;
+            font-size: $small-font-size;
+          }
+        }
+      }
+    }
+  }
+}

asset/scss/components/_lists.scss

@@ -0,0 +1,9 @@
+  dl {
+    .property {
+      display:flex;
+      dt {
+        width: 14rem;
+        max-width: 14rem;
+      }
+    }
+  }

asset/scss/default.scss

@@ -39,7 +39,7 @@
 //@include foundation-switch;
 @include foundation-table;
 // Basic components
-@include foundation-badge;
+//@include foundation-badge;
 @include foundation-breadcrumbs;
 @include foundation-callout;
 @include foundation-card;
@@ -82,6 +82,7 @@
 
 // global project styles
 
+@import "global/print-pdf";
 @import "global/wp-overrides"; //errors
 @import "global/wp-admin";  //errors
 @import "global/typography";
@@ -107,6 +108,7 @@
 @import "components/buttons";
 @import "components/accordion";
 @import "components/tables";
+@import "components/lists";
 
 
 // Templates

asset/scss/global/_branding.scss

@@ -30,7 +30,8 @@
   }
   &.eu{
     &::before {
-      background-image: url('../img/eu_flag_creative_europe_co_funded_left.svg');
+//      background-image: url('../img/eu_flag_creative_europe_co_funded_left.svg');
+      background-image: url('../img/rechts_co-funded-by-the-creative-europe-media-programme-of-the-european-union-flag.png');
     }
   }
 }

asset/scss/global/_print-pdf.scss

@@ -0,0 +1,6 @@
+// https://developer.mozilla.org/en-US/docs/Web/CSS/Paged_Media
+// 
+@media print {
+
+
+}

asset/scss/modules/_content.scss

@@ -68,18 +68,11 @@ main {
 }
 
 
+
 //
-// page category
+// .index max-width
 //--------------
-.index{
+.index {
-  main {
-    article {
-      header {
-        .entry-title {
-        }
-      }
-      section {
-      }
   .entry-content,.omekas-entry-content {
     @include breakpoint(small){
     }
@@ -89,11 +82,30 @@ main {
     @include breakpoint(xlarge){
       max-width: unset;
     }
-      }
+    @include breakpoint(xxlarge){
+      max-width: 60 rem;
     }
   }
 }
 
+//
+//
+// .contain selector for max-width
+//--------------
+.contain-width {
+    .entry-content,.omekas-entry-content {
+      @include breakpoint(small){
+      }
+      @include breakpoint(medium){
+        max-width: 50rem;
+      }
+      @include breakpoint(xlarge){
+        max-width: 50rem;
+      }
+    }
+}
+
+
 //
 // news category
 //--------------
@@ -184,9 +196,11 @@ main {
     @include flex-align(center,top);
   }
   header {
-    margin-top: 2*$global-margin;
+    display: none;
-    border-top: 1px solid $body-font-color;
+  
-    padding: $global-padding*2 0;
+  //  margin-top: 2*$global-margin;
+  //  border-top: 1px solid $body-font-color;
+  //  padding: $global-padding*2 0;
   }
   main {
     @include xy-grid;
@@ -223,6 +237,14 @@ main {
         }
         p {
           @include xy-cell(12);
+          position: relative;
+          padding: $global-padding;
+          padding-bottom: $global-padding * 3;
+          .button {
+            position:absolute;
+            right:0;
+            margin-top: $global-padding * 3;
+          }
         }
       }
       @include breakpoint(medium){

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/item-set-results.phtml

@@ -5,7 +5,7 @@
     ['class' => 'advanced-search']
 ); ?>
 
-<h2><?php echo sprintf($this->translate('Item set results for "%s"'), $fulltextSearch); ?></h2>
+<h3 class="item-set-resutls-title"><?php echo sprintf($this->translate('Item set results for "%s"'), $fulltextSearch); ?></h3>
 
 <?php echo $this->pagination(); ?>
 

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";
@@ -34,7 +35,7 @@ $("#archive_page_title").html('<?php echo $_html ?>');
 </script>
 <!-- arc-hive insert ends -->
 
-<h2><?php echo sprintf($this->translate('Search results for “%s”'), $fulltextSearch); ?></h2>
+<h3 class="search-results-for-title"><?php echo sprintf($this->translate('Search results for “%s”'), $fulltextSearch); ?></h3>
 
 
 <div class="results">

view/common/header-collections.phtml

@@ -17,14 +17,6 @@
 </main>
 <nav>
   <menu class="">
-    <ul>
-      <li>
-        Este menu no lo genera Omeka.
-      </li>
-      <li>
-        Creo que emula el menu del wordpress.
-      </li>
-    </ul>
     <?php /*
           echo $site->publicNav()
                     ->menu()

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>