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

Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

Browse Source
This commit is contained in:
leejinho 2019-12-31 17:02:12 +09:00
commit fe92d9ec0b
5 changed files with 72 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/date-splitter.component.scss
View File

@ -3,6 +3,7 @@
align-content: center;
flex-flow: row;
align-items: flex-end;
height: 20px;
.line {
height: 1px;
background-color: #cccccc;

2
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/information.component.html
View File

@ -1 +1 @@
<div>{{ contents }}</div>
<div class="guest">{{ contents }}</div>

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

@ -0,0 +1,13 @@
.guest {
display: flex;
align-content: center;
flex-flow: row;
width: 100%;
background-color: rgba(0, 0, 0, 0.4);
padding: 4px 20px;
color: #ffffff;
border-radius: 100px;
justify-content: center;
justify-items: center;
margin: 10px 0 20px;
}

25
projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
View File

@ -1,26 +1,9 @@
<!--<div class="chat-messages" #scrollMe>
<div class="message-row" *ngIf="eventRemain && messages.length > 0">
<button mat-button (click)="onClickMore($event)">
이전 대화 보기
<span
*ngIf="
!!roomInfo &&
!!firstEventSeq &&
roomInfo.lastReadEventSeq < firstEventSeq
"
>
안읽은 메시지가 더 있습니다.({{
firstEventSeq - (roomInfo.lastReadEventSeq + 1)
}})개
</span>
</button>
</div>-->
<div class="chat-messages" #scrollMe>
<div
*ngIf="eventRemain && messages.length > 0"
class="message-row view-previous bg-accent-dark"
class="message-row view-previous"
>
<button mat-button (click)="onClickMore($event)">
<button mat-button (click)="onClickMore($event)" class="bg-accent-dark">
<svg
xmlns="http://www.w3.org/2000/svg"
width="20"
@ -36,7 +19,8 @@
<polyline class="st0" points="12.9,10 10,7.1 7.1,10 " />
<line class="st0" x1="10" y1="12.9" x2="10" y2="7.1" />
</svg>
이전 대화 보기
<span>이전 대화 보기</span>
</button>
<div
class="unRead-count"
*ngIf="
@ -54,7 +38,6 @@
</span>
<span class="line"></span>
</div>
</button>
<span class="line"></span>
</div>

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

@ -15,6 +15,7 @@ $meBox-bg: #ffffff;
background-color: rgba(0, 0, 0, 0.1);
padding: 10px;
margin: 10px 0;*/
width: 100%;
}
.message-row {
@ -176,31 +177,34 @@ $meBox-bg: #ffffff;
white-space: pre-wrap;
word-break: break-word;
}
.view-previous {
::ng-deep .view-previous {
display: flex;
align-content: center;
flex-flow: row;
background-color: rgba(0, 0, 0, 0.4);
padding: 4px 10px;
flex-flow: column;
//background-color: rgba(0, 0, 0, 0.4);
color: #ffffff;
border-radius: 100px;
justify-content: center;
justify-items: center;
margin: 10px 0 20px;
button {
height: 24px;
line-height: 24px;
height: 100%;
width: 100%;
border-radius: 100px;
.mat-button-wrapper {
justify-items: center;
svg {
stroke: #ffffff;
align-self: center;
margin-right: 4px;
}
}
}
.unRead-count {
}
.unRead-count {
display: flex;
justify-items: self-end;
flex-flow: row;
align-items: flex-end;
height: 20px;
margin: 10px 0;
.line {
height: 1px;
background-color: #cccccc;
@ -214,5 +218,7 @@ $meBox-bg: #ffffff;
font-size: 13px;
text-align: center;
font-weight: 600;
color: #333333;
}
}
}