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

File diff suppressed because one or more lines are too long

View File

@ -288,28 +288,28 @@ body.vertical-menu header .desktop {
// #. Footer
// ------------------
footer {
@include xy-grid-container;
padding: (2 * $global-padding) 0;
@include breakpoint(small down) {
// footer {
// @include xy-grid-container;
// padding: (2 * $global-padding) 0;
//
// @include breakpoint(small down) {
// margin: 0 $global-margin;
}
}
// }
// }
body.vertical-menu footer {
background-color: $white;
max-width: none;
width: 100%;
margin: 0;
padding: $global-padding;
min-height: 10vh;
@include breakpoint(large up) {
width: calc(100% - #{xy-cell-size(2)});
margin-left: xy-cell-size(2);
}
}
// body.vertical-menu footer {
// background-color: $white;
// max-width: none;
// width: 100%;
// margin: 0;
// padding: $global-padding;
// min-height: 10vh;
//
// @include breakpoint(large up) {
// width: calc(100% - #{xy-cell-size(2)});
// margin-left: xy-cell-size(2);
// }
// }
// #. Resource Browse
// ------------------