This commit is contained in:
Peter Maquiran
2021-06-10 14:00:44 +01:00
parent 2ba4a4a29d
commit 837111d7ce
6 changed files with 16 additions and 20 deletions
+10 -12
View File
@@ -46,12 +46,12 @@
</ion-row>
<ion-row class="ion-align-items-center">
<button *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="right-icons d-md-none btn-no-color">
<ion-icon src="assets/images/icons-profile-calendar-md.svg">ddddddd</ion-icon>
<button *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="d-md-none btn-no-color">
<ion-icon class="right-icons" src="assets/images/icons-profile-calendar-md.svg"></ion-icon>
</button>
<button *ngIf="profile == 'pr' " (click)="changeProfile()" class="btn-no-color">
<ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg">dddddddd</ion-icon>
<ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
</button>
<button class="btn-no-color" (click)="viewEventsToApprove()" *ngIf="loggeduser.Profile == 'MDGPR'">
@@ -109,14 +109,12 @@
</ng-template>
</div>
</div>
<div class="calendar-border">
</div>
<!-- Calendar currente date -->
<ion-row class="timeline-header ion-justify-content-between ion-align-items-center currente-date-timelien pb-5">
<ion-row class="timeline-date align-center">
@@ -164,16 +162,16 @@
</div>
</div>
<div class="timeline-wrapper flex-grow-1" >
<!-- Progress bar -->
<div class="timeline-wrapper flex-grow-1 height-100" >
<!-- Progress bar -->
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<!-- Timeline -->
<div>
<div class="timeline-container d-flex py-20 pl-20" >
<div class="height-100">
<div class="timeline-container height-100 d-flex pt-20 pl-20" >
<!-- <div [ngSwitch]="view" class="ss-timeline timeline-mobile flex-grow-1 d-md-none">
<mwl-calendar-day-view
@@ -215,7 +213,7 @@
</div>
</div> -->
<div class="ss-timeline timeline-mobile flex-grow-1 d-md-none text-black " >
<div class="ss-timeline timeline-mobile flex-grow-1 d-md-none text-black height-100 overflow-y-auto" >
<div *ngFor="let events of TimelineMDList | keyvalue;" >
<div >
@@ -256,7 +254,7 @@
</div>
</div>
<div class="fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black pr-20" *ngIf="loggeduser.Profile == 'MDGPR'">
<div class="fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black pr-20 height-100 mr-md-20 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
<div *ngFor="let events of TimelineMDList | keyvalue;" >
<div >
@@ -294,7 +292,7 @@
</div>
</div>
<div class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pr-20" >
<div class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pr-20 height-100 overflow-y-auto" >
<div *ngFor="let events of TimelinePRList | keyvalue;">
<div >
+2 -2
View File
@@ -605,8 +605,8 @@ td.monthview-primary-with-event {
.timeline-wrapper{
width: 100%;
overflow: scroll;
overflow-x: hidden;
overflow: auto;
// overflow-x: hidden;
}
}
}
@@ -15,7 +15,6 @@ ion-menu{
.main-header{
font-family: Roboto;
background-color: #fff;
overflow:hidden;
color:#000;
transform: translate3d(0, 1px, 0);
@@ -28,7 +27,6 @@ ion-menu{
width: 37px;
float: left;
font-size: 35px;
overflow: hidden;
}
.middle{
//width: 230px;
@@ -206,7 +204,6 @@ ion-menu{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
}
}
.buttons{
@@ -81,7 +81,7 @@ ion-content{
/* NEW CSS */
.main-content{
.main-content {
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
+1
View File
@@ -77,6 +77,7 @@ export class LoginPage implements OnInit {
this.username.trim().length > 0
);
}
validatePassword() {
return (
this.password.trim().length > 0