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 {

View File

@@ -92,7 +92,7 @@
}
// Globe
.globe__cut {
margin-top: 8vw;
}
// .globe__cut {
// margin-top: 8vw;
// }
}

View File

@@ -165,24 +165,32 @@
position: absolute;
z-index: 0;
top: 0;
left: 50%;
left: 0;
width: 100%;
max-width: 1920px;
height: 100%;
transform: translateX(-50%);
transform-origin: 0 0;
background-image: var(--url-mobile);
background-position: 0 0;
background-repeat: no-repeat;
background-size: 100% auto;
will-change: transform, opacity;
@include breakpoint (sm) {
background-image: var(--url-desktop);
}
@media (min-width: $screen-sm) and (-webkit-min-device-pixel-ratio: 2),
(min-width: $screen-sm) and (min-resolution: 192dpi) {
background-image: var(--url-desktop-2x);
div {
position: relative;
left: 50%;
width: 100%;
height: 100%;
transform: translateX(-50%);
transform-origin: 0 0;
background-image: var(--url-mobile);
background-position: 0 0;
background-repeat: no-repeat;
background-size: 100% auto;
@include breakpoint (sm) {
background-image: var(--url-desktop);
}
@media (min-width: $screen-sm) and (-webkit-min-device-pixel-ratio: 2),
(min-width: $screen-sm) and (min-resolution: 192dpi) {
background-image: var(--url-desktop-2x);
}
}
}
}