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 25 additions and 4 deletions
Showing only changes of commit a5261b3b50 - Show all commits

File diff suppressed because one or more lines are too long

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
@ -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;