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

# Conflicts: # public/index.html # public/routes/navRoutes.js
2019-07-19 15:34:10 +02:00
parent a4da6243f5 35b5748af9
commit a56ab9cadd
7 changed files with 270 additions and 164 deletions
@@ -25,14 +25,19 @@
 }
 .om-content {
  margin: 10px;
-  margin-top: 80px;
+  margin-top: 40px;
  margin-bottom: 80px;
+  width: auto;
+  overflow: hidden;
 }
 .om-content a {
-  color: #0046a0;
+  color: white;
 }
 .om-content a:hover {
-  color: #0046a0;
+  color: white;
+}
+.content-desktop {
+  margin-right: 30px;
 }
 .om-nav {
  position: fixed;
@@ -32,14 +32,20 @@
 //content
 .om-content{
    margin: 10px;
-    margin-top: 80px;
+    margin-top: 40px;
    margin-bottom: 80px;
+    width: auto;
+    overflow: hidden;
    a{
-        color: @color;
-        &:hover{color:@color;}
+        color: white;
+        &:hover{color:white;}
    }
 }

+.content-desktop {
+    margin-right: 30px;
+}
+
 //footer
 .om-nav{
    position:fixed;