fix merge

This commit is contained in:
2020-04-18 23:24:43 +02:00
67 changed files with 558 additions and 7126 deletions

View File

@@ -79,16 +79,16 @@
}
// Globe
.globe {
margin-bottom: calc(-200px - 8vw);
// .globe {
// margin-bottom: calc(-200px - 8vw);
@include breakpoint (sm) {
margin-bottom: calc(-100px - 28vw);
}
@include breakpoint (xl) {
margin-bottom: -550px;
}
}
// @include breakpoint (sm) {
// margin-bottom: calc(-100px - 28vw);
// }
// @include breakpoint (xl) {
// margin-bottom: -550px;
// }
// }
// Browse
.browse {