Merge branch 'master' into hendrik-testing

website/public/styles/chat.css

@@ -22,6 +22,7 @@ body {
     height: calc(100% - 100px);
 
     display: inline-block;
+    float: left;
 
     overflow-y: auto;
 }
@@ -31,12 +32,14 @@ body {
     overflow-y: auto;
     overflow-x: hidden;
 
-    width: calc(100% - 256px - 75px);
+    width: calc(100% - 256px - 85px);
     height: calc(100% - 80px);
+    margin-right: 10px;
 
     padding: 10px;
 
     display: inline-block;
+    float: right;
 
     word-wrap: break-word;
 }

website/public/styles/index.css

@@ -10,6 +10,19 @@ a.button {
 
 }
 
+a.fbButton {
+    background-color: #3B5998;
+    border-radius: 5px;
+    color: black;
+    cursor: pointer;
+    padding: 8px 20px;
+    font-family: Arial;
+    font-size: 22px;
+    color: white;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+
+}
+
 /* Body */
 body {
     height: 100%;
@@ -28,7 +41,7 @@ body {
 form {
     /*background-color: #a87a87;*/
     border-radius: 12px;
-    height: 85%;
+    height: 80%;
     margin: auto;
     width: 600px;
     overflow-y: auto;
@@ -154,7 +167,7 @@ ul {
     display: none; /* Hidden by default */
     position: fixed; /* Stay in place */
     z-index: 1; /* Sit on top */
-    padding-top: 30px; /* Location of the box */
+    padding-top: 75px; /* Location of the box */
     left: 0;
     top: 0;
     width: 100%; /* Full width */
@@ -216,6 +229,7 @@ ul {
 }
 
 .modal-footer {
+    padding: 2px 8px;
     background-color: #FBC02D;
     color: black;
 }

website/public/styles/main.css

@@ -102,6 +102,7 @@ p {
 
 .group-picture {
     border-radius: 5px;
+    border: none;
 }
 
 .item-box, .item-box-full-width {

website/public/styles/post-popup.css

@@ -14,7 +14,7 @@
 
 /* Modal Content/Box */
 .modal-content {
-    margin: 5% auto;
+    margin: 50px auto;
     width: 70%; /* Could be more or less, depending on screen size */
     overflow-y: auto;
 }

website/public/styles/profile.css

@@ -18,7 +18,7 @@
     display: inline-block;
 }
 
-.friend-button-container button, .status-buttons-container button {
+.friend-button-container button, .status-buttons-container button, .group-button-container button {
     display: block;
 
     margin: 7px 0;
@@ -27,6 +27,10 @@
     font-size: 18px;
 }
 
+.group-button-container button {
+    float: right;
+}
+
 .empty-button {
     background: none;
     cursor: auto;
@@ -51,8 +55,18 @@
     width: 150px;
     height: 150px;
     margin-bottom: -45px;
+
+    object-fit: cover;
+    vertical-align: middle;
 }
 
+.group-picture {
+    border: none;
+    margin-bottom: 0;
+    margin-right: 15px;
+}
+
+
 /* Old */
 
 .profile-box h1.profile-username {
@@ -109,6 +123,11 @@ div.posts .post form textarea.newpost {
     font-size: 0.8em;
 }
 
+.noposts {
+    display: none;
+    text-align: center;
+}
+
 @media only screen and (max-width: 1500px) {
     .post-box {
         width: calc(50% - 68px);