reviewd conflicts for merge

Merge branch 'develop' into fix/site-description-summary
Merge pull request 'fix issue #20 arcHIVE-tech/fixes#20 "' (#28 ) from fix/menu-header-collections into develop
2021-09-02 13:20:44 +02:00 · 2021-09-02 13:18:20 +02:00 · 2021-09-02 11:40:21 +02:00 · 2021-09-02 10:19:54 +02:00
3 changed files with 3 additions and 10 deletions
--- a/asset/css/default.css
+++ b/asset/css/default.css
--- 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/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	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	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