Merge branch 'develop' into fix/print-pdf-css

Merge pull request 'fix/index-collections-issues-21-22' (#30 ) from fix/index-collections-issues-21-22 into develop
Reviewed-on: #30
2021-09-07 10:31:43 +02:00 · 2021-09-02 14:07:24 +02:00 · 2021-09-02 13:29:16 +02:00 · 2021-09-02 13:27:15 +02:00 · 2021-09-02 13:21:35 +02:00 · 2021-09-02 13:20:44 +02:00
5 changed files with 30 additions and 14 deletions
--- a/asset/css/default.css
+++ b/asset/css/default.css
--- a/asset/scss/components/_cards.scss
+++ b/asset/scss/components/_cards.scss
@ -23,7 +23,9 @@
          content: 'Collection';
        }
        &.tech-document-link:before {
-          content: 'Keywords';
+          //content: 'Keywords';
+          display:inline;
+          width: 0;
        }
      }
    }
--- a/asset/scss/default.scss
+++ b/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";
--- a/asset/scss/modules/_content.scss
+++ b/asset/scss/modules/_content.scss
@ -69,6 +69,25 @@ main {



+//
+// .index max-width
+//--------------
+.index {
+  .entry-content,.omekas-entry-content {
+    @include breakpoint(small){
+    }
+    @include breakpoint(medium){
+      max-width: unset;
+    }
+    @include breakpoint(xlarge){
+      max-width: unset;
+    }
+    @include breakpoint(xxlarge){
+      max-width: 60 rem;
+    }
+  }
+}
+
 //
 //
 // .contain selector for max-width
@ -177,9 +196,11 @@ main {
    @include flex-align(center,top);
  }
  header {
-    margin-top: 2*$global-margin;
-    border-top: 1px solid $body-font-color;
-    padding: $global-padding*2 0;
+    display: none;
+  
+  //  margin-top: 2*$global-margin;
+  //  border-top: 1px solid $body-font-color;
+  //  padding: $global-padding*2 0;
  }
  main {
    @include xy-grid;
--- a/view/common/header-collections.phtml
+++ b/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()
Author	SHA1	Message	Date
jorge	f66e1fd99d	Merge branch 'develop' into fix/print-pdf-css	2021-09-07 10:31:43 +02:00
chris	a5261b3b50	Merge pull request 'fix/index-collections-issues-21-22' (#30 ) from fix/index-collections-issues-21-22 into develop Reviewed-on: #30	2021-09-02 14:07:24 +02:00
jorge	b6c511b708	compiled css to check changes for issues 21 and 22	2021-09-02 13:29:16 +02:00
jorge	0aa8b78b8a	Merge branch 'develop' into fix/index-collections-issues-21-22	2021-09-02 13:27:15 +02:00
jorge	0ce8f05c6f	Merge pull request 'fix issue #24 #24 ' (#29 ) from fix/site-description-summary into develop Reviewed-on: #29	2021-09-02 13:21:35 +02:00
jorge	a0352f8762	reviewd conflicts for merge	2021-09-02 13:20:44 +02:00
jorge	8bf5006643	Merge branch 'develop' into fix/site-description-summary	2021-09-02 13:18:20 +02:00
chris	f26a558ff1	Merge pull request 'fix issue #20 arcHIVE-tech/fixes#20 "' (#28 ) from fix/menu-header-collections into develop Reviewed-on: #28	2021-09-02 11:40:21 +02:00
jorge	ffad101b04	hide text latest in collections in index page	2021-09-02 11:10:28 +02:00
jorge	19f2272b11	modified max-width in index collections	2021-09-02 11:00:56 +02:00
jorge	f68954df1c	removed keywords and aligned text in site description card	2021-09-02 10:36:25 +02:00
jorge	b7a482a8a3	mods in header collection to hide false menu as suggested in issue arcHIVE-tech/fixes#20 "	2021-09-02 10:19:54 +02:00