update main branch #47

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

File diff suppressed because one or more lines are too long

View File

@ -44,12 +44,7 @@ main {
section { section {
padding: $global-padding $global-padding*2; padding: $global-padding $global-padding*2;
} }
.omekas-entry-content { .entry-content,.omekas-entry-content {
@include xy-cell(12);
.blocks {
}
}
.entry-content {
@include breakpoint(small){ @include breakpoint(small){
@include xy-cell(12); @include xy-cell(12);
padding: $global-padding*2 ; padding: $global-padding*2 ;
@ -76,22 +71,24 @@ main {
// //
// page category // page category
//-------------- //--------------
.page{ .index{
main { main {
article { article {
@include xy-grid-container(1200);
header { header {
.entry-title { .entry-title {
} }
} }
section { section {
@include xy-cell(12);
} }
.omekas-entry-content { .entry-content,.omekas-entry-content {
.blocks { @include breakpoint(small){
} }
} @include breakpoint(medium){
.entry-content { max-width: unset;
}
@include breakpoint(xlarge){
max-width: unset;
}
} }
} }
} }