No clue what I'm doing2

lektor/lektordata/project/assets/static/style.css

@@ -60,10 +60,24 @@
 }
 
 body {
+<<<<<<< HEAD
     font-family: "Roboto-Regular","Arial",sans-serif;
     margin: 0px;
     padding: 0px;
     background: #f4f4f4;
+=======
+    font-size: 23px;
+    font-family: "Roboto-Light","Arial",sans-serif;
+    margin: 50px 25px
+}
+
+.navbar-nav {
+    padding-top: 10px
+}
+
+.navbar-nav .active a,a:hover {
+    color: #7f5e3c
+>>>>>>> e4c4875 (Constant font sizes above viewport width of 1540px and tried to reduce jumpiness between 1530p and 1540px)
 }
 
 a {
@@ -135,6 +149,7 @@ footer,header,header h1 {
 }
 
 header {
+<<<<<<< HEAD
     width: 100%;
     height: 200px;
     background-image: linear-gradient(to bottom, rgba(0.13, 0.13, 0.13, 0.80), rgba(0.13, 0.13, .13, 0.00)), url(/images/header-bg.jpg);
@@ -159,6 +174,19 @@ nav{
     display: flex;
     align-items: center;
     padding: 0 0 0 28px;
+=======
+    font-size: 20px;
+}
+
+footer {
+    font-size: 16px;
+}
+
+header h1 {
+    margin: 0;
+    font-weight: 700;
+    font-size: 38px;
+>>>>>>> e4c4875 (Constant font sizes above viewport width of 1540px and tried to reduce jumpiness between 1530p and 1540px)
 }
 
 .left_header ul.nav{
@@ -454,7 +482,7 @@ div.left_footer, div.middle_footer, div.right_footer {
 }
 .termine ul > li > div {
   width: 500px;
-  font-size: 0.75vw;
+  font-size: 20px;
 }
 
 
@@ -481,7 +509,7 @@ div.left_footer, div.middle_footer, div.right_footer {
 }
 
 .termine ul > li > ul > li > div{
-    font-size: 0.75vw;
+    font-size: 20px;
 }
 
 
@@ -530,8 +558,89 @@ div.left_footer, div.middle_footer, div.right_footer {
     input[type='checkbox']:not(:checked)+ul {
         display: none;
     }
+<<<<<<< HEAD
     .threecolumn{
         flex-direction: column;
         flex-wrap: wrap;
+=======
+
+    header h1 {
+        font-size: 2.4vw
+    }
+
+    body {
+        font-size: 1.5vw
+    }
+
+    header {
+        font-size: 1.25vw
+    }
+
+    footer {
+        font-size: 1vw
+    }
+
+
+    .termine ul > li {
+      width: 65vw;
+    }
+    .termine ul > li > div {
+      width: 35vw;
+    }
+
+    .termine ul > li > ul > li {
+      width: 11vw;
+    }
+
+    .termine ul > li > ul > li:nth-child(1){
+      width: 16vw;
+    }
+
+    .termine ul > li > ul > li:nth-child(2){
+      width: 5vw;
+    }
+
+    .termine ul > li > div, .termine ul > li > ul > li > div {
+        font-size: 1.25vw;
+    }
+
+}
+
+@media (min-width:769px) and (max-width:1024px) {
+    header h1 {
+        font-size: 3.15vw
+    }
+
+    header nav ul {
+        display: flex;
+        flex-wrap: wrap;
+        width: 75%
+    }
+
+    header nav ul li {
+        flex-basis: 25%;
+        box-sizing: border-box;
+        padding: 5px 2.5% 5px 0
+    }
+
+    div.inner_page.bgimage {
+        min-height: calc((80vw - 60px)*.572)
+    }
+
+    body {
+        font-size: 2.5vw
+    }
+
+    header {
+        font-size: 2vw
+    }
+
+    footer {
+        font-size: 1.75vw
+    }
+
+    .inner_page.bgimage .image img{
+        width: 150px
+>>>>>>> e4c4875 (Constant font sizes above viewport width of 1540px and tried to reduce jumpiness between 1530p and 1540px)
     }
 }