fix merge

This commit is contained in:
2020-04-18 23:27:31 +02:00
4 changed files with 6 additions and 4 deletions

View File

@@ -7,7 +7,7 @@
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 10000; z-index: 400;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
align-items: center; align-items: center;

View File

@@ -3,9 +3,10 @@
position: relative; position: relative;
z-index: 2; z-index: 2;
width: 100vw; width: 100vw;
height: 1040px; height: 100vh;
overflow: hidden; overflow: hidden;
cursor: grab; cursor: grab;
// pointer-events: none;
user-select: none; user-select: none;
////DEBUG//// ////DEBUG////
@@ -21,7 +22,6 @@
margin-top:-1px; margin-top:-1px;
} }
////END DEBUG//// ////END DEBUG////
@include breakpoint (sm) { @include breakpoint (sm) {
height: 140vw; height: 140vw;
@@ -30,6 +30,7 @@
height: 2000px; height: 2000px;
} }
// Cut // Cut
&__cut { &__cut {
opacity: 0.5; opacity: 0.5;

View File

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

View File

@@ -95,4 +95,5 @@
// .globe__cut { // .globe__cut {
// margin-top: 8vw; // margin-top: 8vw;
// } // }
} }