mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 13:02:56 +00:00
merge
This commit is contained in:
@@ -617,7 +617,7 @@ ion-title{
|
||||
-o-border-radius: 10px;
|
||||
padding: 10px;
|
||||
p{
|
||||
margin-bottom: 5px;
|
||||
margin-bottom: 0px;
|
||||
line-height: 15px;
|
||||
}
|
||||
span {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<div class="content d-flex flex-column" *ngIf="task">
|
||||
<div class="main-header">
|
||||
<div class="title-content width-100 d-flex justify-space-between align-center">
|
||||
<div class=" btn-dismiss font-30-rem cursor-pointer" (click)="goBack()" defaultHref="#">
|
||||
<div class=" btn-dismiss font-30-rem cursor-pointer d-flex " (click)="goBack()" defaultHref="#">
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-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>
|
||||
@@ -11,7 +11,7 @@
|
||||
<div class="middle d-flex align-center flex-grow-1">
|
||||
<ion-label class="title">{{ task.Folio }}</ion-label>
|
||||
</div>
|
||||
<div class="div-icon" (click)="openOptions()" *ngIf="p.userPermission([p.permissionList.Agenda.access])">
|
||||
<div class="div-icon d-flex" (click)="openOptions()" *ngIf="p.userPermission([p.permissionList.Agenda.access])">
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-menu.svg"></ion-icon>
|
||||
|
||||
+2
-2
@@ -7,7 +7,7 @@
|
||||
<div class="content d-flex flex-column" *ngIf="task">
|
||||
<div class="main-header" style="overflow: unset !important;">
|
||||
<div class="title-content width-100 d-flex justify-between">
|
||||
<div class="font-30-rem cursor-pointer" (click)="goBack()" defaultHref="#">
|
||||
<div class="font-30-rem cursor-pointer d-flex" (click)="goBack()" defaultHref="#">
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-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>
|
||||
@@ -16,7 +16,7 @@
|
||||
<ion-label class="title">{{ task.Folio}}</ion-label>
|
||||
</div>
|
||||
<div class="menu-ptions">
|
||||
<button class="btn-no-color" (click)="openOptions()">
|
||||
<button class="btn-no-color d-flex" (click)="openOptions()">
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
|
||||
|
||||
@@ -309,6 +309,7 @@ ion-list {
|
||||
.item-subject {
|
||||
width: 84%;
|
||||
float: left;
|
||||
display: flex;
|
||||
|
||||
ion-label {
|
||||
float: left;
|
||||
@@ -324,7 +325,6 @@ ion-list {
|
||||
/* font-size: rem(13); */
|
||||
margin: 0 !important;
|
||||
padding: 0 !important;
|
||||
background-color: white;
|
||||
|
||||
ion-icon {
|
||||
font-size: rem(16);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<div class="content d-flex flex-column" *ngIf="task">
|
||||
<div class="main-header ">
|
||||
<div class="title-content width-100 d-flex justify-space-between ">
|
||||
<div class="font-30-rem cursor-pointer" (click)="goBack()" defaultHref="#">
|
||||
<div class="font-30-rem cursor-pointer d-flex" (click)="goBack()" defaultHref="#">
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-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>
|
||||
@@ -12,7 +12,7 @@
|
||||
<div class="middle flex-grow-1">
|
||||
<ion-label class="title">{{ task.Folio}}</ion-label>
|
||||
</div>
|
||||
<div class="div-icon">
|
||||
<div class="div-icon d-flex">
|
||||
<div autoHide="false" class="d-flex" (click)="openOptions()">
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-30-rem cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-30-rem cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
|
||||
|
||||
@@ -43,9 +43,7 @@
|
||||
padding-left: 5px;
|
||||
}
|
||||
.div-icon{
|
||||
width: 37px !important;
|
||||
font-size: rem(35) !important;
|
||||
padding: 1px;
|
||||
right: 0 !important;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="btn-modal-dismiss">
|
||||
<button class="btn-no-color" (click)="close()">
|
||||
<button class="btn-no-color d-flex" (click)="close()">
|
||||
<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>
|
||||
|
||||
@@ -58,6 +58,7 @@ ion-list{
|
||||
.item-subject{
|
||||
width: 84%;
|
||||
float: left;
|
||||
display: flex;
|
||||
|
||||
ion-label{
|
||||
margin: 0 !important;
|
||||
|
||||
@@ -66,7 +66,7 @@ export class NewPublicationPage implements OnInit {
|
||||
|
||||
getPublicationDetail() {
|
||||
this.showLoader = true;
|
||||
this.publications.GetPublicationById(this.publicationId).subscribe( res =>{
|
||||
this.publications.GetPublicationById(this.publicationId).subscribe( res => {
|
||||
this.publication = {
|
||||
DateIndex: res.DateIndex,
|
||||
DocumentId: res.DocumentId,
|
||||
|
||||
Reference in New Issue
Block a user