From 9c0d1b19f0a23efbe77fa86eadc25e5779b9a37a Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Tue, 10 Jan 2017 15:09:14 +0100
Subject: [PATCH] Merges css files

---
 website/styles/default.css | 69 ------------------------------------
 website/styles/main.css    | 72 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 71 insertions(+), 70 deletions(-)
 delete mode 100644 website/styles/default.css

diff --git a/website/styles/default.css b/website/styles/default.css
deleted file mode 100644
index 6b54cd4..0000000
--- a/website/styles/default.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-----------------------------------------------------------------------------
-Default Stylesheet
-
-last update:    10-01-2017
-Website:        myhyvesbookplus.tk
------------------------------------------------------------------------------*/
-
-/* Remove padding and margin */
-* {
-    margin: 0;
-    padding: 0;
-    border: 0;
-}
-
-/* Move element down (clear), below floating elements */
-.clear {
-    clear: both;
-}
-
-/* Float element to the left side of its containing block */
-.right {
-    float: right;
-}
-
-/* Float element to the left side of its containing block */
-.left {
-    float: left;
-}
-
-/* Font sizes */
-h1 {
-    font-size: 2.2em;
-}
-
-h2 {
-    font-size: 2.0em;
-}
-
-h3 {
-    font-size: 1.8em;
-}
-
-h4 {
-    font-size: 1.6em;
-}
-
-h5 {
-    font-size: 1.4em;
-}
-
-p {
-    font-size: 1.2em;
-}
-
-a, a:link, a:visited, a:hover, a:active {
-    color: inherit;
-    text-decoration: none;
-}
-
-/* Tables */
-table {
-    border-spacing: 0;
-    border-collapse: collapse;
-}
-
-td {
-    text-align: left;
-    font-weight: normal;
-}
\ No newline at end of file
diff --git a/website/styles/main.css b/website/styles/main.css
index 249d64f..d110eb8 100644
--- a/website/styles/main.css
+++ b/website/styles/main.css
@@ -1,7 +1,14 @@
+/*-----------------------------------------------------------------------------
+Default Stylesheet
+
+last update:    10-01-2017
+Website:        myhyvesbookplus.tk
+-----------------------------------------------------------------------------*/
+
 body {
     background-color: white;
     color: #333;
-    font-family: Arial;
+    font-family: Arial, sans-serif;
 }
 
 ::selection {
@@ -13,3 +20,66 @@ body {
     background: #845663;
     color: white;
 }
+
+/* Remove padding and margin */
+* {
+    margin: 0;
+    padding: 0;
+    border: 0;
+}
+
+/* Move element down (clear), below floating elements */
+.clear {
+    clear: both;
+}
+
+/* Float element to the left side of its containing block */
+.right {
+    float: right;
+}
+
+/* Float element to the left side of its containing block */
+.left {
+    float: left;
+}
+
+/* Font sizes */
+h1 {
+    font-size: 2.2em;
+}
+
+h2 {
+    font-size: 2.0em;
+}
+
+h3 {
+    font-size: 1.8em;
+}
+
+h4 {
+    font-size: 1.6em;
+}
+
+h5 {
+    font-size: 1.4em;
+}
+
+p {
+    font-size: 1.2em;
+}
+
+a, a:link, a:visited, a:hover, a:active {
+    color: inherit;
+    text-decoration: none;
+}
+
+/* Tables */
+table {
+    border-spacing: 0;
+    border-collapse: collapse;
+}
+
+td {
+    text-align: left;
+    font-weight: normal;
+}
\ No newline at end of file