Merge remote-tracking branch 'origin/developer' into developer

# Conflicts: # public/index.html
2019-07-19 15:24:46 +02:00
parent 3770d747ba 70befa7c4d
commit 35b5748af9
7 changed files with 300 additions and 262 deletions
@@ -25,7 +25,7 @@
 }
 .om-content {
  margin: 10px;
-  margin-top: 80px;
+  margin-top: 40px;
  margin-bottom: 80px;
  width: auto;
  overflow: hidden;
@@ -32,7 +32,7 @@
 //content
 .om-content{
    margin: 10px;
-    margin-top: 80px;
+    margin-top: 40px;
    margin-bottom: 80px;
    width: auto;
    overflow: hidden;