Merge branch 'master' into lars

2017-02-02 21:04:32 +01:00
parent b206d243b9 839fb247b4
commit e9468b0ec8
10 changed files with 176 additions and 224 deletions
--- a/website/public/styles/profile.css
+++ b/website/public/styles/profile.css
@@ -31,11 +31,14 @@
    display: block;

    margin: 7px 0;
-    width: 200px;

    font-size: 18px;
 }

+.friend-button-container button, .status-buttons-container button, .group-button-fixed {
+    width: 200px;
+}
+
 .group-button-container button {
    float: right;
 }
@@ -73,6 +76,22 @@
    border: none;
 }

+.group-button-fancy span {
+    display: none;
+}
+
+.group-button-fancy:hover {
+    text-align: right;
+}
+
+.group-button-fancy i {
+    display: inline-block;
+}
+
+.group-button-fancy:hover span {
+    display: inline-block;
+    margin-right: 5px;
+}

 /* Old */