Browse Source

Merge remote-tracking branch 'origin/master'

KrisVos130 9 years ago
parent
commit
3ba43a50a8
2 changed files with 2 additions and 1 deletions
  1. 1 0
      app/client/app.css
  2. 1 1
      app/client/client.js

+ 1 - 0
app/client/app.css

@@ -1152,6 +1152,7 @@ nav form input[type="image"]{
     margin: 0;
     padding: 0 15px 0 15px;
     padding-bottom: 20px;
+    word-break: break-all;
 }
 .chat-message:nth-child(even) {
    color: white;

+ 1 - 1
app/client/client.js

@@ -531,7 +531,7 @@ Template.room.helpers({
             if (elem !== undefined && elem !== null) {
                 elem.scrollTop = elem.scrollHeight;
             }
-        }, 1000);
+        }, 100);
         return Chat.find({type: Session.get("type")}, {sort: {time: -1}, limit: 50 }).fetch().reverse();
     },
     likes: function() {