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 16 additions and 3 deletions
Showing only changes of commit bb99a4653f - Show all commits

File diff suppressed because one or more lines are too long

View File

@ -195,7 +195,7 @@ main {
article {
@include card-container();
@include xy-cell();
width: 100%;
width: 100%;
padding: 0;
margin: 0;
@include breakpoint(small){
@ -398,12 +398,25 @@ main {
aside {
background-color: $white;
flex-direction: column;
align-content: center;
align-items: center;
h2 {
margin: $global-margin;
}
}
}
&.collections-all {
}
&.collection-single {
aside {
nav {
width: 100vw;
border-top: $global-border-archive;
border-bottom: $global-border-archive;
margin: 0;
}
}
}
}
//end hero