Merge branch 'chat-pagination' into 'develop'

Chat pagination See merge request soapbox-pub/soapbox-fe!206
2020-09-04 23:32:26 +00:00 · 2020-09-04 23:32:26 +00:00 · 961b4711c4
commit 961b4711c4
parent e523205c5d 8f1b11a394
6 changed files with 7 additions and 1 deletions
--- a/app/soapbox/actions/chats.js
+++ b/app/soapbox/actions/chats.js
--- a/app/soapbox/features/chats/chat_room.js
+++ b/app/soapbox/features/chats/chat_room.js
--- a/app/soapbox/features/chats/components/chat_box.js
+++ b/app/soapbox/features/chats/components/chat_box.js
--- a/app/soapbox/features/chats/components/chat_message_list.js
+++ b/app/soapbox/features/chats/components/chat_message_list.js
--- a/app/soapbox/reducers/chat_message_lists.js
+++ b/app/soapbox/reducers/chat_message_lists.js
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@ -99,12 +99,18 @@
 .chat-messages {
  overflow-y: scroll;
  flex: 1;
+  display: flex;
+  flex-direction: column-reverse;
 }

 .chat-message {
-  margin: 14px 10px;
+  padding: 7px 10px;
  display: flex;

+  &:last-child {
+    padding-top: 14px;
+  }
+
  &__bubble {
    font-size: 15px;
    padding: 4px 10px;