mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
merge
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<ion-header *ngIf="task" class="ion-no-border">
|
||||
<div class="main-header">
|
||||
<div class="title-content width-100 d-flex justify-space-between align-center">
|
||||
<div class=" btn-dismiss font-30 cursor-pointer" (click)="goBack.emit()" defaultHref="#">
|
||||
<div class=" btn-dismiss font-30-rem cursor-pointer" (click)="goBack.emit()" defaultHref="#">
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
|
||||
</div>
|
||||
@@ -33,7 +33,7 @@
|
||||
<ion-content>
|
||||
<div *ngIf="task" class="overflow-y-auto height-100">
|
||||
<div class="middle-content">
|
||||
<h5 *ngIf="intervenientes">Intervenientes</h5>
|
||||
<h5 class="font-17-rem" *ngIf="intervenientes">Intervenientes</h5>
|
||||
<ion-item class="ion-no-margin ion-no-padding">
|
||||
<ion-label>
|
||||
<div *ngFor="let interveniente of intervenientes">
|
||||
@@ -42,7 +42,7 @@
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
<div *ngIf="cc.length > 0">
|
||||
<h5>Com conhecimento</h5>
|
||||
<h5 class="font-17-rem">Com conhecimento</h5>
|
||||
<ion-item class="ion-no-margin ion-no-padding">
|
||||
<ion-label>
|
||||
<div *ngFor="let c of cc">
|
||||
@@ -52,7 +52,7 @@
|
||||
</ion-item>
|
||||
</div>
|
||||
<div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
|
||||
<h5>Detalhes</h5>
|
||||
<h5 class="font-17-rem">Detalhes</h5>
|
||||
<ion-item class="ion-no-margin ion-no-padding">
|
||||
<pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
|
||||
</ion-item>
|
||||
@@ -60,7 +60,7 @@
|
||||
</div>
|
||||
<div class="bottom-content width-100">
|
||||
<ion-list>
|
||||
<h5>Documentos Anexados</h5>
|
||||
<h5 class="font-17-rem">Documentos Anexados</h5>
|
||||
<ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
|
||||
<ion-label class="d-block" (click)="viewDocument.emit(Document.DocId)">
|
||||
<p class="attach-title-item">{{ Document.Assunto || "Sem assunto" }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
color:#d30a0a !important;
|
||||
}
|
||||
.btn-size{
|
||||
font-size: 18px !important;
|
||||
font-size: rem(18) !important;
|
||||
}
|
||||
.main-header{
|
||||
overflow: inherit !important;
|
||||
display: flex;
|
||||
font-family: Roboto;
|
||||
background-color: #fff;
|
||||
@@ -31,14 +32,14 @@
|
||||
.title{
|
||||
width: fit-content;
|
||||
height: auto;
|
||||
font-size: 25px;
|
||||
font-size: rem(25);
|
||||
overflow: auto;
|
||||
float: left;
|
||||
padding-left: 5px;
|
||||
}
|
||||
.div-icon{
|
||||
width: 40px !important;
|
||||
font-size: 35px !important;
|
||||
font-size: rem(35) !important;
|
||||
text-align: start !important;
|
||||
padding: 1px;
|
||||
}
|
||||
@@ -55,7 +56,7 @@ ion-button{
|
||||
.upper-content{
|
||||
font-family: Roboto;
|
||||
margin-left: 41px;
|
||||
font-size: 18px;
|
||||
font-size: rem(18);
|
||||
|
||||
.label{
|
||||
border-radius: 20px;
|
||||
@@ -63,13 +64,14 @@ ion-button{
|
||||
float: right;
|
||||
padding: 5px 13.5px 5px 13.5px;
|
||||
color: #fff;
|
||||
font-size: rem(14);
|
||||
}
|
||||
|
||||
.button-calendar-type ion-button{
|
||||
height: 25px;
|
||||
height: rem(25);
|
||||
}
|
||||
.content-details{
|
||||
font-size: 17px;
|
||||
font-size: rem(17);
|
||||
.date{
|
||||
color: #797979;
|
||||
}
|
||||
@@ -77,7 +79,7 @@ ion-button{
|
||||
}
|
||||
.middle-conten{
|
||||
.middle-content p{
|
||||
font-size: 16px;
|
||||
font-size: rem(16);
|
||||
}
|
||||
}
|
||||
.bottom-content{
|
||||
@@ -85,11 +87,11 @@ ion-button{
|
||||
margin: 0 auto;
|
||||
|
||||
.bottom-content h3{
|
||||
font-size: 16px;
|
||||
font-size: rem(16);
|
||||
margin: 0 0 0 10px;
|
||||
}
|
||||
.attach-document{
|
||||
font-size: 15px;
|
||||
font-size: rem(15);
|
||||
color: var(--title-text-color);
|
||||
margin: 5px 5px 5px 10px;
|
||||
padding: 5px;
|
||||
@@ -97,11 +99,11 @@ ion-button{
|
||||
}
|
||||
.attach-icon{
|
||||
width: 37px;
|
||||
font-size: 35px;
|
||||
font-size: rem(35);
|
||||
float: left;
|
||||
}
|
||||
.attach-title-item{
|
||||
font-size: 18px;
|
||||
font-size: rem(18);
|
||||
width: 100%;
|
||||
color:#0d89d1;
|
||||
padding-bottom: 5px;
|
||||
@@ -109,12 +111,12 @@ ion-button{
|
||||
/* SPAN */
|
||||
.span-left{
|
||||
float: left;
|
||||
font-size: 15x;
|
||||
font-size: rem(15);
|
||||
}
|
||||
.span-right{
|
||||
text-align: right;
|
||||
float: right;
|
||||
font-size: 13px;
|
||||
font-size: rem(13);
|
||||
}
|
||||
}
|
||||
.aside-right{
|
||||
@@ -128,7 +130,7 @@ ion-button{
|
||||
.arrow-right-icon{
|
||||
width: 37px;
|
||||
float: right;
|
||||
font-size: 35px;
|
||||
font-size: rem(35);
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
@@ -139,7 +141,7 @@ ion-button{
|
||||
|
||||
.btn-ok, .btn-cancel, .btn-delete{
|
||||
height: auto !important;
|
||||
font-size: 16px !important;
|
||||
font-size: rem(16) !important;
|
||||
width: 100% !important;
|
||||
margin-bottom: 10px !important;
|
||||
padding: 15px !important;
|
||||
|
||||
@@ -2,25 +2,25 @@
|
||||
<ion-progress-bar type="indeterminate" *ngIf="loading && loaderTop"></ion-progress-bar>
|
||||
<div class="px-20 pt-30 d-flex justify-space-between">
|
||||
<div class="d-flex align-center pointer">
|
||||
<div class="font-35 d-flex" *ngIf="goBackButton" (click)="goBack.emit()">
|
||||
<div class="font-35-rem d-flex" *ngIf="goBackButton" (click)="goBack.emit()">
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg'></ion-icon>
|
||||
</div>
|
||||
<ion-label class="font-25" >{{ headerName }}</ion-label>
|
||||
<ion-label class="font-25-rem" >{{ headerName }}</ion-label>
|
||||
</div>
|
||||
<div class="d-flex align-center ">
|
||||
|
||||
<!-- <div>
|
||||
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
|
||||
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
|
||||
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
|
||||
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src='assets/images/icons-search.svg'></ion-icon>
|
||||
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
|
||||
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
|
||||
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" src='assets/images/icons-search.svg'></ion-icon>
|
||||
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
|
||||
</div>
|
||||
<button title="Fechar" class="btn-no-color d-flex" (click)="closeSearch();showSearch=false;searchSubject=''" *ngIf="showSearch">
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-35" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-35-rem" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
|
||||
</button>
|
||||
|
||||
<div *ngIf="showSearch">
|
||||
@@ -43,11 +43,11 @@
|
||||
<div>
|
||||
<div class="d-flex" (click)="reorderList.emit('old')" *ngIf="ordinance == 'recent' ">
|
||||
|
||||
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg" ></ion-icon>
|
||||
<ion-icon class="mr-10 font-25-rem" src="assets/images/theme/gov/crescente.svg" ></ion-icon>
|
||||
</div>
|
||||
|
||||
<div class="d-flex" (click)="reorderList.emit('recent')" *ngIf="ordinance != 'recent' ">
|
||||
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
|
||||
<ion-icon class="mr-10 font-25-rem" src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
+18
-15
@@ -1,17 +1,20 @@
|
||||
.main-header{
|
||||
font-family: Roboto;
|
||||
font-size: 25px;
|
||||
color:#000;
|
||||
overflow: auto;
|
||||
padding: 30px 20px 0 20px !important;
|
||||
margin: 0;
|
||||
@import '~src/function.scss';
|
||||
|
||||
.thetitle{
|
||||
width: fit-content;
|
||||
float: left;
|
||||
}
|
||||
.theicon{
|
||||
width: fit-content;
|
||||
float: right;
|
||||
}
|
||||
.main-header {
|
||||
overflow: inherit !important;
|
||||
font-family: Roboto;
|
||||
font-size: rem(25);
|
||||
color:#000;
|
||||
overflow: auto;
|
||||
padding: 30px 20px 0 20px !important;
|
||||
margin: 0;
|
||||
|
||||
.thetitle{
|
||||
width: fit-content;
|
||||
float: left;
|
||||
}
|
||||
.theicon{
|
||||
width: fit-content;
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
@import '~src/function.scss';
|
||||
|
||||
/* New CSS */
|
||||
.expediente{
|
||||
@@ -19,7 +20,7 @@
|
||||
width: 100%;
|
||||
float: left;
|
||||
font-family: Roboto;
|
||||
font-size: 12pt;
|
||||
font-size: rem(16);
|
||||
font-weight: 700;
|
||||
color: var(--title-text-color);
|
||||
padding-left: 3px;
|
||||
@@ -32,17 +33,17 @@
|
||||
.exp-icon{
|
||||
width: fit-content;
|
||||
float: right;
|
||||
/* font-size: 13px; */
|
||||
/* font-size: rem(13); */
|
||||
margin: 0 !important;
|
||||
padding: 0 !important;
|
||||
|
||||
ion-icon{
|
||||
font-size: 12pt;
|
||||
font-size: rem(16);
|
||||
color: #42b9fe;
|
||||
float: left;
|
||||
}
|
||||
label{
|
||||
font-size: 10pt;
|
||||
font-size: rem(13);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -51,7 +52,7 @@
|
||||
|
||||
}
|
||||
.exp-middle-detail{
|
||||
font-size: 12pt;
|
||||
font-size: rem(16);
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
|
||||
@@ -62,7 +63,7 @@
|
||||
.label{
|
||||
border-radius: 15px;
|
||||
background: var(--label-bg-color);
|
||||
/* font-size: 12px; */
|
||||
/* font-size: rem(12); */
|
||||
float: right;
|
||||
padding: 2.5px 13.5px 2.5px 13.5px;
|
||||
color: #fff;
|
||||
@@ -71,7 +72,7 @@
|
||||
.exp-date{
|
||||
width: auto;
|
||||
font-family: Roboto;
|
||||
font-size: 10pt;
|
||||
font-size: rem(13);
|
||||
font-weight: normal;
|
||||
font-stretch: normal;
|
||||
font-style: normal;
|
||||
@@ -82,7 +83,7 @@
|
||||
}
|
||||
}
|
||||
.exp-bottom-detail{
|
||||
font-size: 8pt;
|
||||
font-size: rem(10);
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
padding-left: 3px;
|
||||
@@ -90,7 +91,7 @@
|
||||
.exp-remetente{
|
||||
//width: 200px;
|
||||
font-family: Roboto;
|
||||
/* font-size: 13px; */
|
||||
/* font-size: rem(13); */
|
||||
font-weight: normal;
|
||||
color: #000000;
|
||||
float: left;
|
||||
@@ -104,7 +105,7 @@
|
||||
overflow: auto;
|
||||
}
|
||||
.div-search{
|
||||
font-size: 45px;
|
||||
font-size: rem(45);
|
||||
float: left;
|
||||
margin: 0 0 0 10px
|
||||
}
|
||||
@@ -118,7 +119,7 @@
|
||||
width: 100%;
|
||||
}
|
||||
.div-profile{
|
||||
font-size: 45px;
|
||||
font-size: rem(45);
|
||||
float: right;
|
||||
margin-right: 10px;
|
||||
}
|
||||
Reference in New Issue
Block a user