Merge branch 'new-messaging' into staging

2017-08-25 14:42:34 +02:00
parent 9e04d039d7 22d754d514
commit 57d0c6c973
13 changed files with 1449 additions and 10 deletions
--- a/www/contacts/main.less
+++ b/www/contacts/main.less
@@ -52,6 +52,7 @@ body {
    width: 350px;
    height: 100%;
    background-color: lighten(@bg-color, 10%);
+    overflow-y: auto;
    .friend {
        background: rgba(0,0,0,0.1);
        padding: 5px;
@@ -169,8 +170,8 @@ body {
            margin: 10px;
        }
        .more-history {
-            display: none;
-            //.hover;
+            //display: none;
+            .hover;
        }
    }
    .chat {