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 2020-02-14 17:52:13 +09:00
commit f14dd52877
3 changed files with 72 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html
View File

@ -15,13 +15,15 @@
<mat-tab-group animationDuration="0ms" vertical> <mat-tab-group animationDuration="0ms" vertical>
<mat-tab *ngIf="data.content.text"> <mat-tab *ngIf="data.content.text">
<ng-template mat-tab-label> <ng-template mat-tab-label>
<mat-checkbox #chkText> </mat-checkbox> <mat-checkbox #chkText checked="true"> </mat-checkbox>
<span class="title-text">{{ <span class="title-text">{{
'common.file.clipboardType.text' | translate 'common.file.clipboardType.text' | translate
}}</span> }}</span>
</ng-template> </ng-template>
<perfect-scrollbar> <perfect-scrollbar>
<div style="white-space: pre-wrap;">{{ data.content.text }}</div> <div class="clipboard-text" style="white-space: pre-wrap;">
{{ data.content.text }}
</div>
</perfect-scrollbar> </perfect-scrollbar>
</mat-tab> </mat-tab>
<!-- <mat-tab *ngIf="data.content.rtf"> <!-- <mat-tab *ngIf="data.content.rtf">
@ -59,7 +61,7 @@
</ng-template> </ng-template>
<perfect-scrollbar> <perfect-scrollbar>
<div> <div class="clipboard-img">
<img [src]="data.content.imageDataUrl" /> <img [src]="data.content.imageDataUrl" />
</div> </div>
</perfect-scrollbar> </perfect-scrollbar>

93
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss
View File

@ -1,55 +1,64 @@
.clipboard-frame { .clipboard {
padding: 16px; &-frame {
height: 100%; padding: 16px;
min-width: 500px; height: 100%;
position: relative; min-width: 500px;
.mat-dialog-container {
position: relative; position: relative;
}
.mat-card-header { .mat-dialog-container {
position: relative; position: relative;
width: 100%;
border-bottom: 1px solid #dddddd;
margin-bottom: 12px;
.btn-dialog-close {
font-size: 20px;
display: flex;
margin-left: auto;
align-self: flex-start;
color: #444444;
} }
}
.mat-card-content { .mat-card-header {
flex: 0 0 auto;
display: flex;
align-items: flex-start;
height: calc(100% - 100px);
border-bottom: 1px solid #dddddd;
.clipboard-tab {
position: relative; position: relative;
width: 100%; width: 100%;
height: 100%; border-bottom: 1px solid #dddddd;
.mat-tab-group { margin-bottom: 12px;
.btn-dialog-close {
font-size: 20px;
display: flex; display: flex;
flex-direction: row; margin-left: auto;
align-self: flex-start;
color: #444444;
}
}
.mat-card-content {
flex: 0 0 auto;
display: flex;
align-items: flex-start;
height: calc(100% - 100px);
border-bottom: 1px solid #dddddd;
.clipboard-tab {
position: relative; position: relative;
height: 100%;
width: 100%; width: 100%;
height: 100%;
.mat-tab-group {
display: flex;
flex-direction: row;
position: relative;
height: 100%;
width: 100%;
}
}
}
.button-farm {
text-align: right;
position: absolute;
width: 100%;
bottom: 10px;
margin: 0 -16px;
.mat-primary {
margin-left: 4px;
} }
} }
} }
&-text {
.button-farm { padding: 0 10px;
text-align: right; white-space: pre-wrap;
position: absolute; }
width: 100%; &-img {
bottom: 10px; padding: 0 10px;
margin: 0 -16px;
.mat-primary {
margin-left: 4px;
}
} }
} }

26
projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
View File

@ -407,15 +407,21 @@ $daesang-grey: (
mat-tab-group[vertical] { mat-tab-group[vertical] {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
.mat-tab-labels { .mat-tab-header {
display: flex; border-bottom: none;
flex-direction: column; .mat-tab-labels {
align-content: flex-start; display: flex;
.mat-tab-label { flex-direction: column;
justify-content: flex-start; align-content: flex-start;
padding: 0; .mat-tab-label {
.mat-checkbox { justify-content: flex-start;
margin-right: 8px; padding: 0;
&[aria-selected='true'] {
opacity: 1;
}
.mat-checkbox {
margin-right: 8px;
}
} }
} }
} }
@ -425,7 +431,7 @@ $daesang-grey: (
.mat-tab-body-wrapper { .mat-tab-body-wrapper {
flex: 1 1 auto; flex: 1 1 auto;
border-left: 1px solid #dddddd; border-left: 1px solid #dddddd;
padding: 0 10px; padding: 0;
} }
} }