peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2021-09-30 15:58:23 +01:00
parent 7364277d95 f31e7f917b
commit e8bcf71b1a
6 changed files with 43 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/group-messages/group-messages.page.html
+5 -5
View File
@@ -10,7 +10,7 @@
</button> </button>
</div> </div>
<div class="middle-container" *ngIf="!showMessageOptions"> <div class="middle-container" *ngIf="!showMessageOptions">
<div class="middle"> <div class="middle add-ellipsis">
<ion-label class="title">{{roomName}}</ion-label> <ion-label class="title">{{roomName}}</ion-label>
</div> </div>
</div> </div>
@@ -66,14 +66,14 @@
<div> <div>
<div class="file"> <div class="file">
<!-- <canvas id="pdf_canvas"></canvas> --> <!-- <canvas id="pdf_canvas"></canvas> -->
<ion-label class="file-details" *ngIf="msg.file"> <div class="file-details add-ellipsis" *ngIf="msg.file">
<span (click)="viewDocument(file.title_link)" class="file-title cursor-pointer"> <span (click)="viewDocument(file.title_link)" class="cursor-pointer">
<fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
<fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
<ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon> <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
{{file.title}}
</span> </span>
</ion-label> <ion-label class="file-title">{{file.title}}</ion-label>
</div>
</div> </div>
<div class="file-details-optional"> <div class="file-details-optional">
<ion-label *ngIf="msg.file"> <ion-label *ngIf="msg.file">
src/app/pages/chat/group-messages/group-messages.page.scss
+8 -29
View File
@@ -28,14 +28,21 @@
} }
.middle-container{ .middle-container{
display: flex;
overflow: auto; overflow: auto;
height: auto; height: auto;
width:calc(100% - 57px); width:calc(100% - 47px);
float: left; float: left;
/* white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important; */
.middle{ .middle{
width: 100%;
padding: 0!important; padding: 0!important;
margin: 0 0 0 10px; margin: 0 0 0 10px;
font-size: 25px;
} }
} }
.middle-container-options{ .middle-container-options{
@@ -95,13 +102,6 @@
} }
} }
.title{
font-size: 25px;
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
float: left;
}
.div-icon{ .div-icon{
width: 40px; width: 40px;
float: right; float: right;
@@ -217,28 +217,7 @@
float: right; float: right;
} }
} }
.message{
.message-attachments{
.file{
align-items: center;
.file-details{
width: 100%;
.file-title{
color: #000;
text-decoration: underline;
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
}
.file-title:hover{
color: #0782c9;
}
}
}
}
}
.online{ .online{
color:#99e47b !important; color:#99e47b !important;
} }
src/app/pages/chat/messages/messages.page.html
+4 -4
View File
@@ -64,14 +64,14 @@
<div> <div>
<div class="file"> <div class="file">
<!-- <canvas id="pdf_canvas"></canvas> --> <!-- <canvas id="pdf_canvas"></canvas> -->
<ion-label class="file-details" *ngIf="msg.file"> <div class="file-details add-ellipsis" *ngIf="msg.file">
<span (click)="viewDocument(file.title_link)" class="file-title cursor-pointer"> <span (click)="viewDocument(file.title_link)" class="cursor-pointer">
<fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
<fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
<ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon> <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
{{file.title}}
</span> </span>
</ion-label> <ion-label class="file-title">{{file.title}}</ion-label>
</div>
</div> </div>
<div class="file-details-optional"> <div class="file-details-optional">
<ion-label *ngIf="msg.file"> <ion-label *ngIf="msg.file">
src/app/shared/chat/group-messages/group-messages.page.html
+4 -4
View File
@@ -59,14 +59,14 @@
<div> <div>
<div class="file"> <div class="file">
<!-- <canvas id="pdf_canvas"></canvas> --> <!-- <canvas id="pdf_canvas"></canvas> -->
<ion-label class="file-details" *ngIf="msg.file"> <div class="file-details add-ellipsis" *ngIf="msg.file">
<span (click)="viewDocument(file.title_link)" class="file-title cursor-pointer"> <span (click)="viewDocument(file.title_link)" class="cursor-pointer">
<fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
<fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
<ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon> <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
{{file.title}}
</span> </span>
</ion-label> <ion-label class="file-title">{{file.title}}</ion-label>
</div>
</div> </div>
<div class="file-details-optional"> <div class="file-details-optional">
<ion-label *ngIf="msg.file"> <ion-label *ngIf="msg.file">
src/app/shared/chat/messages/messages.page.html
+5 -4
View File
@@ -51,14 +51,15 @@
<div> <div>
<div class="file"> <div class="file">
<!-- <canvas id="pdf_canvas"></canvas> --> <!-- <canvas id="pdf_canvas"></canvas> -->
<ion-label class="file-details" *ngIf="msg.file"> <div class="file-details add-ellipsis" *ngIf="msg.file">
<span (click)="viewDocument(file.title_link)" class="file-title cursor-pointer"> <span *ngIf="msg.file.type" (click)="viewDocument(file.title_link)" class="cursor-pointer">
<fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
<fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
<fa-icon *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'" icon="file-word" class="excel-icon"></fa-icon>
<ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon> <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
{{file.title}}
</span> </span>
</ion-label> <ion-label class="file-title">{{file.title}}</ion-label>
</div>
</div> </div>
<div class="file-details-optional"> <div class="file-details-optional">
<ion-label *ngIf="msg.file"> <ion-label *ngIf="msg.file">
src/global.scss
+17 -4
View File
@@ -1103,6 +1103,12 @@ ngx-mat-datetime-content{
} }
} }
.add-ellipsis{
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
}
.menuButton{ .menuButton{
font-size: 14px; font-size: 14px;
width: 100%; width: 100%;
@@ -1119,22 +1125,29 @@ ngx-mat-datetime-content{
background-color: #42b9fe13; background-color: #42b9fe13;
padding: 1px; padding: 1px;
.file{ .file{
width: 100%;
align-items: center;
overflow: auto;
color: #000;
ion-thumbnail{ ion-thumbnail{
--size: 20px; --size: 20px;
} }
.file-details{ .file-details{
max-width: calc(100% - 20px); max-width: 100%;
padding-left: 5px; padding-left: 5px;
/* .file-title{
padding-left: 5px;
} */
.file-title:hover{ .file-title:hover{
color: #0782c9; color: #0782c9;
text-decoration: underline; text-decoration: underline;
} }
span{ span{
white-space: nowrap; padding-right: 5px;
overflow: hidden !important;
text-overflow: ellipsis !important;
} }
} }
} }