fix merge

2020-04-18 23:27:31 +02:00
parent 10e32a1957 689c03fda1
commit 8e36c2b2f0
4 changed files with 6 additions and 4 deletions
--- a/src/style/pages/_homepage.scss
+++ b/src/style/pages/_homepage.scss
@@ -79,9 +79,9 @@
    }

    // Globe
+
    // .globe {
    //     margin-bottom: calc(-200px - 8vw);
-
    //     @include breakpoint (sm) {
    //         margin-bottom: calc(-100px - 28vw);
    //     }
--- a/src/style/pages/_page.scss
+++ b/src/style/pages/_page.scss
@@ -95,4 +95,5 @@
    // .globe__cut {
    //     margin-top: 8vw;
    // }
+
 }