update main branch #47

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

File diff suppressed because one or more lines are too long

View File

@ -23,7 +23,9 @@
content: 'Collection'; content: 'Collection';
} }
&.tech-document-link:before { &.tech-document-link:before {
content: 'Keywords'; //content: 'Keywords';
display:inline;
width: 0;
} }
} }
} }

View File

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

View File

@ -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 // .contain selector for max-width
@ -177,9 +196,11 @@ main {
@include flex-align(center,top); @include flex-align(center,top);
} }
header { 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 { main {
@include xy-grid; @include xy-grid;

View File

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