Merge branch 'master' into hendrik-testing

website/public/styles/index.css

@@ -198,12 +198,6 @@ ul {
     animation-duration: 0.4s
 }
 
-/* Add Animation */
-@-webkit-keyframes animatetop {
-    from {top:-300px; opacity:0}
-    to {top:0; opacity:1}
-}
-
 @keyframes animatetop {
     from {top:-300px; opacity:0}
     to {top:0; opacity:1}

website/public/styles/main.css

@@ -256,8 +256,6 @@ div[data-title]:hover:after {
     top: 150%;
     z-index: 200;
     white-space: nowrap;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
     border-radius: 3px;
     box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
     background-color: #333;

website/public/styles/post-popup.css

@@ -48,6 +48,10 @@
     width: 90%;
 }
 
+.post-content a {
+    text-decoration: underline;
+}
+
 .commentfield {
     margin-bottom: 20px;
 }
@@ -87,17 +91,5 @@
 
 .deleteButton {
     background-color: firebrick;
-
-}
-
-.deleteButton i {
-    display: inline-block;
-}
-
-.deleteButton:hover span {
-    display: inline-block;
-}
-
-.deleteButton span {
-    display: none;
+    float: right;
 }

website/public/styles/profile.css

@@ -27,14 +27,22 @@
     display: inline-block;
 }
 
+.friend-button-container div, .status-buttons-container div {
+    width: 200px;
+    display: inline-block;
+}
+
 .friend-button-container button, .status-buttons-container button, .group-button-container button {
     display: block;
+    float: right;
 
     margin: 7px 0;
-    width: 200px;
 
     font-size: 18px;
 }
+.status-buttons-container button {
+    float: left;
+}
 
 .group-button-container button {
     float: right;
@@ -71,9 +79,24 @@
 
 .group-picture {
     border: none;
-    margin-right: 15px;
 }
 
+.fancy-button span {
+    display: none;
+}
+
+.fancy-button:hover {
+    text-align: right;
+}
+
+.fancy-button i {
+    display: inline-block;
+}
+
+.fancy-button:hover span {
+    display: inline-block;
+    margin-right: 5px;
+}
 
 /* Old */
 
@@ -98,6 +121,10 @@ div.posts div.post {
     word-wrap: break-word;
 }
 
+div.posts div.post a {
+    text-decoration: underline;
+}
+
 div.posts div.post:hover {
     box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
 }