From 18f7c91c35fbad9f60b4394c25e0d808952ff62c Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 14 Aug 2018 11:47:09 +0200
Subject: [PATCH] Adjust styling

---
 client/src/styles/_reset.scss      |  8 ++++++++
 client/src/styles/_typography.scss | 22 +++++++++++++++++++++-
 client/src/styles/_variables.scss  |  4 +++-
 client/src/styles/main.scss        | 13 +------------
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/client/src/styles/_reset.scss b/client/src/styles/_reset.scss
index 7af790d9..3cfbcb9b 100644
--- a/client/src/styles/_reset.scss
+++ b/client/src/styles/_reset.scss
@@ -1,6 +1,8 @@
+// Initially from
 // http://meyerweb.com/eric/tools/css/reset/
 //  v2.0 | 20110126
 //  License: none (public domain)
+// adjusted by Ramon Wenger
 
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
@@ -33,6 +35,7 @@ body {
 
 ol, ul {
   list-style: none;
+  margin: 0;
 }
 
 blockquote, q {
@@ -49,3 +52,8 @@ table {
   border-collapse: collapse;
   border-spacing: 0;
 }
+
+a {
+  color: inherit;
+  text-decoration: none;
+}
diff --git a/client/src/styles/_typography.scss b/client/src/styles/_typography.scss
index c7d998ad..034818c0 100644
--- a/client/src/styles/_typography.scss
+++ b/client/src/styles/_typography.scss
@@ -1,10 +1,19 @@
 @import "variables";
 
 * {
-  font-family: $font-family;
   font-size: $base-font-size;
 }
 
+h1, h2, h3, h4, h5 {
+  font-family: $sans-serif-font-family;
+  font-weight: 600;
+}
+
+p, a {
+  font-family: $serif-font-family;
+  font-weight: 300;
+}
+
 h1 {
   font-size: 5rem;
   font-weight: 800;
@@ -12,3 +21,14 @@ h1 {
   margin-bottom: 18px;
 }
 
+h2 {
+
+}
+
+h3 {
+  font-size: 2.5rem;
+}
+
+h4 {
+  font-size: 1.5rem;
+}
diff --git a/client/src/styles/_variables.scss b/client/src/styles/_variables.scss
index 654832ba..7d85dcda 100644
--- a/client/src/styles/_variables.scss
+++ b/client/src/styles/_variables.scss
@@ -1,10 +1,12 @@
 $grey-1: #333333;;
 $grey-2: #A1A1A1;
+$grey-3: #F3F3F3;
 
 $header-color: $grey-1;
 $intro-color: $grey-2;
 
-$font-family: 'Montserrat', Arial, sans-serif;
+$sans-serif-font-family: 'Montserrat', Arial, sans-serif;
+$serif-font-family: "ff-meta-serif-web-pro", serif;
 $base-font-size: 14px;
 
 
diff --git a/client/src/styles/main.scss b/client/src/styles/main.scss
index a9f33057..c613ae8a 100644
--- a/client/src/styles/main.scss
+++ b/client/src/styles/main.scss
@@ -7,18 +7,6 @@
 @import "typography";
 @import "variables";
 
-body {
-  font-family: $font-family;
-  font-size: $base-font-size;
-}
-
-ul {
-  margin-left: 16px;
-}
-
-a {
-  text-decoration: none;
-}
 
 //todo: move
 .container {
@@ -43,6 +31,7 @@ a {
       color: #17A887;
       font-size: 36px;
       font-weight: 800;
+      font-family: $sans-serif-font-family;
     }
   }
   footer {