Merge branch 'master' into lars-chat

2017-01-24 14:26:48 +01:00
parent a88483ae47 ee6b55bd91
commit dbb23922d8
13 changed files with 224 additions and 90 deletions
--- a/website/public/styles/search.css
+++ b/website/public/styles/search.css
@@ -14,4 +14,16 @@
 .searchleft, .searchright {
    display: inline-block;
    vertical-align: top;
+}
+
+.user-pageselect, .searchleft h4, .group-pageselect, .searchright h4 {
+    display: inline-block;
+}
+
+.user-pageselect, .group-pageselect {
+    float: right;
+}
+
+li.search-item:hover{
+    background-color: #EEE;
 }