ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger

Browse Source
This commit is contained in:
leejh 2019-11-01 17:43:17 +09:00
commit d323168b4f
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss
View File

@ -75,7 +75,6 @@
} }
} }
.room-option { .room-option {
width: 100%;
margin-left: auto; margin-left: auto;
} }
} }

4
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/recall.component.scss
View File

@ -1,6 +1,8 @@
.bubble-main { .bubble-main {
padding: 14px; padding: 14px;
text-align:left; text-align:left;
display:flex;
align-items: center;
.icon-recall{ .icon-recall{
width: 30px; width: 30px;
height: 30px; height: 30px;
@ -13,6 +15,8 @@
i{ i{
color:#ffffff; color:#ffffff;
font-size:20px; font-size:20px;
padding-left: 2px;
padding-top: 2px;
} }
} }
.recall-msg{ .recall-msg{

5
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss
View File

@ -1,4 +1,9 @@
.bubble-main { .bubble-main {
padding: 14px; padding: 14px;
text-align:left; text-align:left;
span{
word-wrap: break-word;
white-space: pre-wrap;
word-break: keep-all;
}
} }

12
projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
View File

@ -160,6 +160,8 @@ $meBox-bg: #ffffff;
position: relative; position: relative;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-right:40px;
margin-left:0;
.profile-img { .profile-img {
flex: 0 0 auto; flex: 0 0 auto;
img{ img{
@ -170,6 +172,8 @@ $meBox-bg: #ffffff;
&.me { &.me {
.chat-row { .chat-row {
flex-direction: row-reverse; flex-direction: row-reverse;
margin-left:40px;
margin-right:0;
.profile-info { .profile-info {
flex-direction: row-reverse; flex-direction: row-reverse;
display: flex; display: flex;
@ -181,6 +185,7 @@ $meBox-bg: #ffffff;
.message-main { .message-main {
margin-left: 20px; margin-left: 20px;
margin-right: 10px; margin-right: 10px;
max-width: 80%;
.chat-name { .chat-name {
font-size: 12px; font-size: 12px;
color: #333333; color: #333333;
@ -193,6 +198,8 @@ $meBox-bg: #ffffff;
background-color: $otherBox-bg; background-color: $otherBox-bg;
border-radius: 4px; border-radius: 4px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
word-break: break-all;
word-wrap: break-word;
&:before { &:before {
content: ''; content: '';
width: 0px; width: 0px;
@ -276,3 +283,8 @@ $meBox-bg: #ffffff;
} }
} }
} }
.bubble-main{
word-wrap: break-word;
white-space: pre-wrap;
word-break: keep-all;
}