From de8a598f8c540645f8a7d405fcce1de7338525fa Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Thu, 9 Apr 2020 11:47:05 +0200 Subject: [PATCH] Improve conversations UI --- .../css/pages/conversations/conversation.css | 20 ++++++++++++++++--- assets/js/pages/conversations/conversation.js | 6 +++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/assets/css/pages/conversations/conversation.css b/assets/css/pages/conversations/conversation.css index 7807849a..f0d997ae 100644 --- a/assets/css/pages/conversations/conversation.css +++ b/assets/css/pages/conversations/conversation.css @@ -4,6 +4,14 @@ * @author Pierre HUBERT */ +.big-box-conversation .direct-chat-info span { + margin-right: 10px; +} + +.big-box-conversation .direct-chat-msg { + margin-bottom: 15px; +} + .big-box-conversation .direct-chat-text { display: inline-block; margin-left: 10px; @@ -11,9 +19,15 @@ word-wrap: break-word; } -.big-box-conversation .right .direct-chat-text { - float: right; - margin-right: 10px; +.big-box-conversation .direct-chat-msg.curruser .direct-chat-text::after, +.big-box-conversation .direct-chat-msg.curruser .direct-chat-text::before { + border-right-color: #3c8dbc; +} + +.big-box-conversation .direct-chat-msg.curruser .direct-chat-text { + background: #3c8dbc; + border-color: #3c8dbc; + color: white; } .big-box-conversation .direct-chat-text .message-img { diff --git a/assets/js/pages/conversations/conversation.js b/assets/js/pages/conversations/conversation.js index 1ffbcb49..fefea082 100644 --- a/assets/js/pages/conversations/conversation.js +++ b/assets/js/pages/conversations/conversation.js @@ -229,7 +229,7 @@ const ConversationPageConvPart = { //Create message container var messageContainer = createElem2({ type: "div", - class: "direct-chat-msg " + (userIsOwner ? "right" : "") + class: "direct-chat-msg " + (userIsOwner ? "curruser" : "") }); //Apply message container @@ -253,7 +253,7 @@ const ConversationPageConvPart = { var nameContainer = createElem2({ appendTo: topInformation, type: "span", - class: "direct-chat-name pull-right", + class: "direct-chat-name", innerHTML: "Loading" }); @@ -261,7 +261,7 @@ const ConversationPageConvPart = { createElem2({ appendTo: topInformation, type: "span", - class: "direct-chat-timestamp pull-left", + class: "direct-chat-timestamp", innerHTML: ComunicWeb.common.date.timeDiffToStr(info.time_insert) });