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

@@ -14,16 +14,16 @@
// Globe
.globe {
margin-top: -96px;
margin-bottom: -160px;
// margin-top: -96px;
// margin-bottom: -160px;
@include breakpoint (sm) {
margin-bottom: calc(-120px - 6vw);
}
@include breakpoint (xl) {
margin-top: -176px;
margin-bottom: -240px;
}
// @include breakpoint (sm) {
// margin-bottom: calc(-120px - 6vw);
// }
// @include breakpoint (xl) {
// margin-top: -176px;
// margin-bottom: -240px;
// }
}
// Browse

View File

@@ -4,7 +4,7 @@
top: 0;
left: 0;
width: 100%;
transition: opacity 0.4s $ease-quart;
transition: opacity 0.3s $ease-quart;
will-change: opacity;
&.is-transitioning {