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:
richard-loafle 2020-02-12 17:37:05 +09:00
commit d3f67d587b
6 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ucap-webmessenger", "name": "ucap-webmessenger",
"version": "0.0.19", "version": "0.0.20",
"author": { "author": {
"name": "LG CNS", "name": "LG CNS",
"email": "lgucap@lgcns.com" "email": "lgucap@lgcns.com"

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html
View File

@ -17,7 +17,7 @@
></ucap-account-change-password> ></ucap-account-change-password>
</div> </div>
</mat-card-content> </mat-card-content>
<mat-card-actions class="button-farm flex-row"> <mat-card-actions class="button-frame flex-row">
<button <button
mat-stroked-button mat-stroked-button
(click)="onClickChoice(false)" (click)="onClickChoice(false)"

4
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.scss
View File

@ -1,4 +1,4 @@
::ng-deep .setting-frame { .setting-frame {
padding: 16px; padding: 16px;
height: 100%; height: 100%;
min-width: 400px; min-width: 400px;
@ -23,7 +23,7 @@
border-bottom: 1px solid #dddddd; border-bottom: 1px solid #dddddd;
} }
.button-farm { .button-frame {
text-align: right; text-align: right;
position: absolute; position: absolute;
width: 100%; width: 100%;

5
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.html
View File

@ -20,7 +20,10 @@
{{ data.notice.regDate }} {{ data.notice.regDate }}
</div> </div>
<perfect-scrollbar> <perfect-scrollbar>
<p [innerHTML]="data.notice.content | linky" class="contnets"></p> <p
[innerHTML]="data.notice.content | linefeedtohtml | linky"
class="contnets"
></p>
</perfect-scrollbar> </perfect-scrollbar>
</mat-card-content> </mat-card-content>
<mat-card-actions class="button-farm flex-row"> <mat-card-actions class="button-farm flex-row">

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

@ -165,7 +165,9 @@ $tablet-s-width: 768px;
} }
} }
} }
::ng-deep .bubble-main {
::ng-deep .bubble {
.bubble-main {
word-wrap: break-word; word-wrap: break-word;
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-word; word-break: break-word;
@ -173,12 +175,18 @@ $tablet-s-width: 768px;
color: #0367a6; color: #0367a6;
text-decoration: underline; text-decoration: underline;
} }
}
.btn-box {
min-width: 300px;
@media screen and (max-width: #{$tablet-s-width}) {
min-width: 250px;
}
}
} }
::ng-deep .view-previous { ::ng-deep .view-previous {
display: flex; display: flex;
flex-flow: column; flex-flow: column;
//background-color: rgba(0, 0, 0, 0.4);
color: #ffffff; color: #ffffff;
justify-content: center; justify-content: center;
justify-items: center; justify-items: center;

2
projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss
View File

@ -128,7 +128,7 @@
margin-top: 10px; margin-top: 10px;
} }
} }
::ng-deep .attach-file { .attach-file {
display: flex; display: flex;
flex-flow: row; flex-flow: row;
flex: 1 1 auto; flex: 1 1 auto;