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 7 additions and 2 deletions
Showing only changes of commit 8d0b6cceb1 - Show all commits

File diff suppressed because one or more lines are too long

View File

@ -377,12 +377,17 @@ main {
flex-direction: column; flex-direction: column;
min-height: unset; min-height: unset;
padding: $global-padding; padding: $global-padding;
//min-height: unset; .menu, .menu.horizontal {
justify-content: center;
}
} }
@include breakpoint(large) { @include breakpoint(large) {
flex-direction: row; flex-direction: row;
min-height: $global-padding * 6; min-height: $global-padding * 6;
padding: $global-padding 0 ; padding: $global-padding 0 ;
.menu, .menu.horizontal {
justify-content: unset;
}
} }
a { a {
color: $body-font-color; color: $body-font-color;