From 3cd07722242f7c99dd9664d635c103750b363967 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Fri, 13 Jan 2017 11:48:26 +0100
Subject: [PATCH 1/2] Cleanup in main.css

---
 website/styles/main.css | 156 +++++++++++++++++++++-------------------
 1 file changed, 81 insertions(+), 75 deletions(-)

diff --git a/website/styles/main.css b/website/styles/main.css
index cbf9477..fa85d7f 100644
--- a/website/styles/main.css
+++ b/website/styles/main.css
@@ -1,64 +1,10 @@
 /*-----------------------------------------------------------------------------
 Default Stylesheet
 
-last update:    10-01-2017
+last update:    13-01-2017
 Website:        myhyvesbookplus.tk
 -----------------------------------------------------------------------------*/
 
-.profile-picture {
-    border-radius: 50%;
-    height: 42px;
-    width: 42px;
-    object-fit: cover;
-    vertical-align: middle;
-}
-
-.group-picture {
-    border-radius: 5px;
-    height: 42px;
-    width: 42px;
-    object-fit: cover;
-    vertical-align: middle;
-}
-
-html {
-    height: 100%;
-}
-
-body {
-    height: 100%;
-
-    background-color: #B78996;
-    color: #333;
-
-    font-family: Arial, sans-serif;
-}
-
-.content {
-    padding: 20px;
-    margin-top: 80px;
-    margin-left: 256px;
-    min-height: 100%;
-}
-
-.platform {
-    padding: 20px;
-    margin-bottom: 10px;
-    border-radius: 10px;
-    background-color: #FFFFFF;
-    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
-}
-
-::selection {
-    background: #845663;
-    color: white;
-}
-
-::-moz-selection {
-    background: #845663;
-    color: white;
-}
-
 /* Remove padding and margin */
 * {
     margin: 0;
@@ -66,19 +12,15 @@ body {
     border: 0;
 }
 
-/* Move element down (clear), below floating elements */
-.clear {
-    clear: both;
+html {
+    height: 100%;
 }
 
-/* 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;
+body {
+    height: 100%;
+    background-color: #B78996;
+    color: #333;
+    font-family: Arial, sans-serif;
 }
 
 /* Font sizes */
@@ -110,23 +52,81 @@ p {
     font-size: 1.2em;
 }
 
+/* Selection colors */
+::selection {
+    background: #845663;
+    color: white;
+}
+
+::-moz-selection {
+    background: #845663;
+    color: white;
+}
+
+/* All content underneath the menu */
+.content {
+    padding: 20px;
+    margin-top: 80px;
+    margin-left: 256px;
+    min-height: 100%;
+}
+
+/* White boxes (squares) */
+.platform {
+    padding: 20px;
+    margin-bottom: 10px;
+    border-radius: 10px;
+    background-color: #FFFFFF;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+}
+
+.profile-picture, .group-picture {
+    height: 42px;
+    width: 42px;
+    object-fit: cover;
+    vertical-align: middle;
+}
+
+.profile-picture {
+    border-radius: 50%;
+}
+
+.group-picture {
+    border-radius: 5px;
+}
+
+/* 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;
+}
+
+/* All links */
 a, a:link, a:visited, a:hover, a:active {
     color: inherit;
     text-decoration: none;
 }
 
+/* All buttons, inputfields/selectfields. */
 button, input, select {
     width: auto;
     height: 32px;
-
     cursor: pointer;
     border: none;
-
-    font-family: Arial, sans-serif;
     font-size: 16px;
     border-radius: 7px;
 }
 
+/* All textinput and sections */
 textarea, input, select {
     padding: 0 5px;
     background: white;
@@ -134,11 +134,12 @@ textarea, input, select {
     border: 1px solid #845663;
     border-radius: 7px;
     font-size: 16px;
-
-
 }
 
-button, input[type="submit"], input[type="reset"] {
+/* All buttons */
+button,
+input[type="submit"],
+input[type="reset"] {
     background-color: #845663;
     color: white;
     padding: 0 10px;
@@ -157,12 +158,17 @@ td {
 }
 
 /* Custom title box, appears instantaneously */
-a[data-title]:hover, img[data-title]:hover, span[data-title]:hover, div[data-title]:hover {
+a[data-title]:hover,
+img[data-title]:hover,
+span[data-title]:hover,
+div[data-title]:hover {
     position: relative;
 }
 
-a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after,
-div[data-title]:hover:after{
+a[data-title]:hover:after,
+img[data-title]:hover:after,
+span[data-title]:hover:after,
+div[data-title]:hover:after {
     content: attr(data-title);
     padding: 4px 4px;
     color: #FFFFFF;

From 9db7c6776ce19116a9ca9c0efc93b1d0a5919048 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Fri, 13 Jan 2017 12:03:46 +0100
Subject: [PATCH 2/2] Moved <head>-tag to the page files, not all css files
 will be loaded for each page.

---
 website/admin.php      | 35 +++++++++++++++++++----------------
 website/chat.php       | 35 +++++++++++++++++++----------------
 website/group.php      | 35 +++++++++++++++++++----------------
 website/profile.php    | 35 +++++++++++++++++++----------------
 website/search.php     | 35 +++++++++++++++++++----------------
 website/settings.php   | 33 +++++++++++++++++++--------------
 website/template.php   | 35 +++++++++++++++++++----------------
 website/views/head.php | 35 ++++++++++++++---------------------
 8 files changed, 147 insertions(+), 131 deletions(-)

diff --git a/website/admin.php b/website/admin.php
index 8d8f8b5..7529705 100644
--- a/website/admin.php
+++ b/website/admin.php
@@ -1,21 +1,24 @@
 <!DOCTYPE html>
 <html>
-    <?php
-        include("views/head.php");
-     ?>
-    <body>
-        <?php
-            /*
-             * This view adds the main layout over the screen.
-             * Header and menu.
-             */
-            include("views/main.php");
+<head>
+    <?php include("views/head.php"); ?>
+    <style>
+        @import url("styles/adminpanel.css");
+    </style>
+</head>
+<body>
+<?php
+/*
+ * This view adds the main layout over the screen.
+ * Header and menu.
+ */
+include("views/main.php");
 
-            /* Add your view files here. */
-            include("views/adminpanel.php");
+/* Add your view files here. */
+include("views/adminpanel.php");
 
-            /* This adds the footer. */
-            include("views/footer.php");
-         ?>
-    </body>
+/* This adds the footer. */
+include("views/footer.php");
+?>
+</body>
 </html>
diff --git a/website/chat.php b/website/chat.php
index 218b082..b2ed584 100644
--- a/website/chat.php
+++ b/website/chat.php
@@ -1,21 +1,24 @@
 <!DOCTYPE html>
 <html>
-    <?php
-        include("views/head.php");
-    ?>
-    <body>
-        <?php
-            /*
-             * This view adds the main layout over the screen.
-             * Header, menu, footer.
-             */
-             include("views/main.php");
+<head>
+    <?php include("views/head.php"); ?>
+    <style>
+        @import url("styles/chat.css");
+    </style>
+</head>
+<body>
+<?php
+/*
+ * This view adds the main layout over the screen.
+ * Header, menu, footer.
+ */
+include("views/main.php");
 
-            /* Add your view files here. */
-            include("views/chat-view.php");
+/* Add your view files here. */
+include("views/chat-view.php");
 
-                        /* This adds the footer. */
-            include("views/footer.php");
-        ?>
-    </body>
+/* This adds the footer. */
+include("views/footer.php");
+?>
+</body>
 </html>
diff --git a/website/group.php b/website/group.php
index ad307e2..819c630 100644
--- a/website/group.php
+++ b/website/group.php
@@ -1,21 +1,24 @@
 <!DOCTYPE html>
 <html>
-    <?php
-    include("views/head.php");
-    ?>
-    <body>
-        <?php
-            /*
-             * This view adds the main layout over the screen.
-             * Header, menu, footer.
-             */
-            include("views/main.php");
+<head>
+    <?php include("views/head.php"); ?>
+    <style>
+        @import url("styles/profile.css");
+    </style>
+</head>
+<body>
+<?php
+/*
+ * This view adds the main layout over the screen.
+ * Header, menu, footer.
+ */
+include("views/main.php");
 
-            /* Add your view files here. */
-            include("views/group.php");
+/* Add your view files here. */
+include("views/group.php");
 
-            /* This adds the footer. */
-            include("views/footer.php");
-        ?>
-    </body>
+/* This adds the footer. */
+include("views/footer.php");
+?>
+</body>
 </html>
diff --git a/website/profile.php b/website/profile.php
index 2dc9891..b26c354 100644
--- a/website/profile.php
+++ b/website/profile.php
@@ -1,21 +1,24 @@
 <!DOCTYPE html>
 <html>
-    <?php
-        include("views/head.php");
-    ?>
-    <body>
-        <?php
-            /*
-             * This view adds the main layout over the screen.
-             * Header, menu, footer.
-             */
-            include("views/main.php");
+<head>
+    <?php include("views/head.php"); ?>
+    <style>
+        @import url("styles/profile.css");
+    </style>
+</head>
+<body>
+<?php
+/*
+ * This view adds the main layout over the screen.
+ * Header, menu, footer.
+ */
+include("views/main.php");
 
-            /* Add your view files here. */
-            include("views/profile.php");
+/* Add your view files here. */
+include("views/profile.php");
 
-            /* This adds the footer. */
-            include("views/footer.php");
-        ?>
-    </body>
+/* This adds the footer. */
+include("views/footer.php");
+?>
+</body>
 </html>
diff --git a/website/search.php b/website/search.php
index 6a045c3..33df2fe 100644
--- a/website/search.php
+++ b/website/search.php
@@ -1,21 +1,24 @@
 <!DOCTYPE html>
 <html>
-    <?php
-        include("views/head.php");
-    ?>
-    <body>
-        <?php
-            /*
-             * This view adds the main layout over the screen.
-             * Header and menu.
-             */
-            include("views/main.php");
+<head>
+    <?php include("views/head.php"); ?>
+    <style>
+        @import url("styles/search.css");
+    </style>
+</head>
+<body>
+<?php
+/*
+ * This view adds the main layout over the screen.
+ * Header and menu.
+ */
+include("views/main.php");
 
-            /* Add your view files here. */
-            include("views/search-view.php");
+/* Add your view files here. */
+include("views/search-view.php");
 
-            /* This adds the footer. */
-            include("views/footer.php");
-        ?>
-    </body>
+/* This adds the footer. */
+include("views/footer.php");
+?>
+</body>
 </html>
diff --git a/website/settings.php b/website/settings.php
index 8d154b1..577cd8b 100644
--- a/website/settings.php
+++ b/website/settings.php
@@ -1,19 +1,24 @@
 <!DOCTYPE html>
 <html>
-<?php include("views/head.php"); ?>
-    <body>
-        <?php
-        /*
-         * This view adds the main layout over the screen.
-         * Header and menu.
-         */
-        include("views/main.php");
+<head>
+    <?php include("views/head.php"); ?>
+    <style>
+        @import url("styles/settings.css");
+    </style>
+</head>
+<body>
+<?php
+/*
+ * This view adds the main layout over the screen.
+ * Header and menu.
+ */
+include("views/main.php");
 
-        /* Add your view files here. */
-        include("views/settings-view.php");
+/* Add your view files here. */
+include("views/settings-view.php");
 
-        /* This adds the footer. */
-        include("views/footer.php");
-        ?>
-    </body>
+/* This adds the footer. */
+include("views/footer.php");
+?>
+</body>
 </html>
diff --git a/website/template.php b/website/template.php
index b594d58..f52a526 100644
--- a/website/template.php
+++ b/website/template.php
@@ -1,21 +1,24 @@
 <!DOCTYPE html>
 <html>
-    <?php
-        include("views/head.php");
-     ?>
-    <body>
-        <?php
-            /*
-             * This view adds the main layout over the screen.
-             * Header and menu.
-             */
-            include("views/main.php");
+<head>
+    <?php include("views/head.php"); ?>
+    <style>
+        /*Insert own stylesheet here ;)*/
+    </style>
+</head>
+<body>
+<?php
+/*
+ * This view adds the main layout over the screen.
+ * Header and menu.
+ */
+include("views/main.php");
 
-            /* Add your view files here. */
-            include("views/homepage.php");
+/* Add your view files here. */
+include("views/homepage.php");
 
-            /* This adds the footer. */
-            include("views/footer.php");
-         ?>
-    </body>
+/* This adds the footer. */
+include("views/footer.php");
+?>
+</body>
 </html>
diff --git a/website/views/head.php b/website/views/head.php
index 0d51d03..4da866c 100644
--- a/website/views/head.php
+++ b/website/views/head.php
@@ -1,21 +1,14 @@
-<head>
-    <meta charset="utf-8">
-    <title>MyHyvesbook+</title>
-    <!-- Add your javascript files here. -->
-    <script src="js/jquery.js"></script>
-    <script src="js/header.js"></script>
-    <script src="js/menu.js"></script>
-    <style>
-        /* Add your css files here. */
-        @import url("styles/main.css");
-        @import url("styles/profile.css");
-        @import url("styles/font-awesome.css");
-        @import url("styles/header.css");
-        @import url("styles/menu.css");
-        @import url("styles/footer.css");
-        @import url("styles/search.css");
-        @import url("styles/adminpanel.css");
-        @import url("styles/chat.css");
-        @import url("styles/settings.css");
-    </style>
-</head>
+<meta charset="utf-8">
+<title>MyHyvesbook+</title>
+<!-- Add your javascript files here. -->
+<script src="js/jquery.js"></script>
+<script src="js/header.js"></script>
+<script src="js/menu.js"></script>
+<style>
+    /* Add your css files here. */
+    @import url("styles/main.css");
+    @import url("styles/font-awesome.css");
+    @import url("styles/header.css");
+    @import url("styles/menu.css");
+    @import url("styles/footer.css");
+</style>