Merge branch 'master' into marijn-chat

2017-01-11 14:04:53 +01:00
parent eecdcad538 4be13bb66c
commit 916589dac7
19 changed files with 2855 additions and 13 deletions
--- a/website/styles/main.css
+++ b/website/styles/main.css
@@ -13,15 +13,31 @@ Website:        myhyvesbookplus.tk
    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 {
    margin-top: 80px;
    margin-left: 256px;
+    min-height: 100%;
 }

 ::selection {