-
+
{{ 'general, current' | translate}}
-
+
{{ 'general, proposed' | translate}}
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss
index 31893558..00918629 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss
@@ -1,264 +1,281 @@
+.actionBtn {
-
- .actionBtn{
-
- height: auto;
- min-height: 35px !important;
- padding: 10px;
- font-size: 12px;
- white-space: normal;
-
- }
- button.actionBtn.button.button-md,
- button.actionBtn.button.button-ios,
- button.actionBtn.button.button
- {
- width: 90%;
+ height: auto;
+ min-height: 35px !important;
+ padding: 10px;
+ font-size: 12px;
+ white-space: normal;
+
+}
+
+button.actionBtn.button.button-md,
+button.actionBtn.button.button-ios,
+button.actionBtn.button.button {
+ width: 90%;
+}
+
+.actionBtnCol {
+ text-align: center;
+}
+
+.actionBtnGrid {
+
+ padding: 0px;
+}
+
+.notColBtn {
+
+ min-height: 150px !important;
+ padding: 0px;
+ background: transparent;
+ border: 2px solid #e4e5e7;
+
+ p {
+ color: var(--secondary);
+ margin-top: 0px;
+ margin-bottom: 0px;
+ font-weight: normal;
+ font-size: 14px;
+ white-space: normal;
+ padding: 3px 0px;
+ min-height: 50px;
}
- .actionBtnCol{
- text-align: center;
+
+ span {
+ display: block;
+
}
- .actionBtnGrid{
-
- padding:0px;
+
+ .serviceItemImg {
+ min-width: 60px !important;
+ min-height: 70px !important;
+ width: 70px;
+ height: 70px;
+ margin: 10px auto;
+ background: transparent !important;
}
- .notColBtn {
-
- min-height: 150px !important;
- padding: 0px;
- background: transparent;
- border: 2px solid #e4e5e7;
- p{
- color: var(--secondary);
- margin-top: 0px; margin-bottom:0px;
- font-weight: normal;
- font-size: 14px;
- white-space: normal;
- padding: 3px 0px;
- min-height: 50px;
- }
- span {
- display: block;
-
- }
-
- .serviceItemImg {
- min-width: 60px !important;
- min-height: 70px !important;
- width: 70px;
- height: 70px;
- margin: 10px auto;
- background: transparent !important;
- }
-
- }
- .notColBtn.button,.notColBtn.button-md, .notColBtn.button-ios{
- background: transparent !important;
- color: var(--dark);
- box-shadow: none;
- -webkit-box-shadow:none;
- -moz-box-shadow: none;
- padding: 0px;
- color: var(--secondary);
- border: 2px solid var(--gray);
- min-width: auto;
- }
+
+}
+
+.notColBtn.button,
+.notColBtn.button-md,
+.notColBtn.button-ios {
+ background: transparent !important;
+ color: var(--dark);
+ box-shadow: none;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ padding: 0px;
+ color: var(--secondary);
+ border: 2px solid var(--gray);
+ min-width: auto;
+}
+
////////////////////////
- .itemHISBtn{
- padding: 5px;
- color: var(--light);
- background: var(--darkgray);
- border-radius: 3px;
- width: 85%;
- height: 40px;
- }
-
-
- .rowBtn{
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
- background: white;
- }
-
-
-
- .rowBorder{
- border-bottom: solid 0.02cm var(--grayBG);
-
-
- }
- .colBorder{
- border-right: solid 0.02cm var(--grayBG);
-
- }
-
- .dateActionHistory{
- display: inline-block;
- margin-left: 5px;
- text-align: left;
- }
- .req_info{
- width: 25px;
- height: 25px;
- display: inline-block;
- margin: 0;
- }
-
- .deligate{
- margin-left: 25px;
- }
- .actionBtn{
- --border-radius: 50% !important;
- height: 55px;
- width: 55px;
- --background: var(--newgreen); // will be dynamic
- background: transparent;
- margin:10px;
- }
-
- .itemAttch{
- border-radius: 11px;
- margin: 8px;
- --min-height: 60px;
- --max-height: 60px;
- }
-
- .less {
- max-height: 54px;
- }
-
- .noDataDiv{
- background: #ffffff;
- height: 11%;
- text-align: center;
- padding-top: 1px;
- border-radius: 10px;
- margin: 10px;
- }
-
- .no-data-div{
- background: #ffffff;
- height: 100%;
- text-align: center;
- padding-top: 1px;
- border-radius: 10px;
- margin: 10px;
- }
-
- .container {
- font-size: 14px;
- line-height: 14px;
- height: 15px;
- overflow: hidden;
- text-align: justify;
- }
-
- .show {
- overflow: visible;
- height: auto;
- }
-
- .showMore{
- padding: 0px;
- background: transparent;
- color: blue;
- text-decoration: underline;
- font-size: 14px;
- }
-
- // .succssfullMSG{
- // height: 100%;
- // width: 100%;
- // background: var(--newgreen);
- // color: white;
- // font-weight: bold;
- // font-size: 20px;
- // text-align: center;
- // vertical-align: middle;
- // padding-top: 30px;
- // }
-
- // .succssfullIcon{
- // width: 60%;
- // text-align: center;
- // height: 36%;
- // padding-top: 100px;
- // }
- ////////////////////////////////
- .subOrdinateList{
- // margin: 10px;
- // border-top-left-radius: 45px;
- // border-bottom-left-radius: 45px;
- // border: var(--cusgray) 1px solid !important;
- --background: transparent;
- margin-left: -15px;
- margin-right: 6px;
- margin-bottom:8px;
-}
-.status{
+.itemHISBtn {
+ padding: 5px;
+ color: var(--light);
+ background: var(--darkgray);
+ border-radius: 3px;
+ width: 85%;
+ height: 40px;
+}
+
+
+.rowBtn {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ background: white;
+}
+
+
+
+.rowBorder {
+ border-bottom: solid 0.02cm var(--grayBG);
+
+
+}
+
+.colBorder {
+ border-right: solid 0.02cm var(--grayBG);
+
+}
+
+.dateActionHistory {
+ display: inline-block;
+ margin-left: 5px;
+ text-align: left;
+}
+
+.req_info {
+ width: 25px;
+ height: 25px;
+ display: inline-block;
+ margin: 0;
+}
+
+.deligate {
+ margin-left: 25px;
+}
+
+.actionBtn {
+ --border-radius: 50% !important;
+ height: 55px;
+ width: 55px;
+ --background: var(--newgreen); // will be dynamic
+ background: transparent;
+ margin: 10px;
+}
+
+.itemAttch {
+ border-radius: 11px;
+ margin: 8px;
+ --min-height: 60px;
+ --max-height: 60px;
+}
+
+.less {
+ max-height: 54px;
+}
+
+.noDataDiv {
+ background: #ffffff;
+ height: 11%;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+}
+
+.no-data-div {
+ background: #ffffff;
+ height: 100%;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+}
+
+.container {
+ font-size: 14px;
+ line-height: 14px;
+ height: 15px;
+ overflow: hidden;
+ text-align: justify;
+}
+
+.show {
+ overflow: visible;
+ height: auto;
+}
+
+.showMore {
+ padding: 0px;
+ background: transparent;
+ color: blue;
+ text-decoration: underline;
+ font-size: 14px;
+}
+
+// .succssfullMSG{
+// height: 100%;
+// width: 100%;
+// background: var(--newgreen);
+// color: white;
+// font-weight: bold;
+// font-size: 20px;
+// text-align: center;
+// vertical-align: middle;
+// padding-top: 30px;
+// }
+
+// .succssfullIcon{
+// width: 60%;
+// text-align: center;
+// height: 36%;
+// padding-top: 100px;
+// }
+////////////////////////////////
+.subOrdinateList {
+ // margin: 10px;
+ // border-top-left-radius: 45px;
+ // border-bottom-left-radius: 45px;
+ // border: var(--cusgray) 1px solid !important;
+ --background: transparent;
+ margin-left: -15px;
+ margin-right: 6px;
+ margin-bottom: 8px;
+}
+
+.status {
text-align: center;
-// background: green;
-border-radius: 10px;
-font-size: 10px !important;
-height: 40px;
-color: white;
-position: relative;
-}
-.rowHeader{
+ // background: green;
+ border-radius: 10px;
+ font-size: 10px !important;
+ height: 40px;
+ color: white;
+ position: relative;
+}
+
+.rowHeader {
border-bottom: 1px solid var(--cusgray);
padding-bottom: 10px;
margin-bottom: -17px;
}
-.container{
- position:relative;
+.container {
+ position: relative;
}
-.overflow-hid-div{
- overflow:hidden;
- margin-left:50px;
- width:200px;
+
+.overflow-hid-div {
+ overflow: hidden;
+ margin-left: 50px;
+ width: 200px;
height: 200px;
- background-color:red;
-
+ background-color: red;
+
}
-.inner{
- width:50px;
+
+.inner {
+ width: 50px;
height: 50px;
- background-color:green;
+ background-color: green;
position: absolute;
- left:25px;
- top:25px;
-
+ left: 25px;
+ top: 25px;
+
}
-.gridSubordinates{
- margin-left: 3%;//38px;
- border-top-left-radius: 16px;//28px;
- border-bottom-left-radius: 16px;//40px;
- // padding-left: 8px;
- background:var(--light);
- border-top-right-radius: 16px;
- border-bottom-right-radius: 16px;
+
+.gridSubordinates {
+ margin-left: 3%; //38px;
+ border-top-left-radius: 16px; //28px;
+ border-bottom-left-radius: 16px; //40px;
+ // padding-left: 8px;
+ background: var(--light);
+ border-top-right-radius: 16px;
+ border-bottom-right-radius: 16px;
}
-.subOrdinateDiv{
+.subOrdinateDiv {
z-index: 4;
- margin-left: 0px;//-32px;
+ margin-left: 0px; //-32px;
// position: absolute;
- top: 5px;//-2px;
+ top: 5px; //-2px;
float: left;
margin-right: 10px;
}
-.subOrdinateImg{
- width: 85px;
- border: #e4e4e4 solid 2px;
- -moz-border-radius: 50%;
- border-radius: 50%;
- border: 3px solid #f0efef;
+
+.subOrdinateImg {
+ width: 85px;
+ border: #e4e4e4 solid 2px;
+ -moz-border-radius: 50%;
+ border-radius: 50%;
+ border: 3px solid #f0efef;
}
-.subOrdinateRow{
+.subOrdinateRow {
margin-left: 55px;
}
@@ -270,7 +287,8 @@ position: relative;
margin-right: -13px;
margin-bottom: 8px;
}
-.gridSubordinates-Ar{
+
+.gridSubordinates-Ar {
border-top-right-radius: 28px;
border-bottom-right-radius: 40px;
background: var(--light);
@@ -289,39 +307,46 @@ position: relative;
position: absolute;
top: -2px;
}
+
///////////////////////////////////////////////
-.label{
-font-size: 14px;
+.label {
+ font-size: 14px;
}
-.subjectNotification{
+.subjectNotification {
text-align: center;
padding-top: 10px;
font-weight: bold;
}
-.action-history ion-card-content{
- padding:0;
+
+.action-history ion-card-content {
+ padding: 0;
}
+
ion-card.action-history {
- margin:10px
+ margin: 10px
}
-.submitterInfo{
+
+.submitterInfo {
padding-top: 10px;
padding-bottom: 10px;
}
-ion-card{
+
+ion-card {
color: black !important;
}
+
////
-.tabBar{
- height:70px
+.tabBar {
+ height: 70px
}
-.cardAlignTextEn{
+.cardAlignTextEn {
text-align: left;
}
-.cardAlignTextAr{
+
+.cardAlignTextAr {
text-align: right;
}
@@ -331,34 +356,41 @@ ion-card{
.active-Segment {
font-size: 0.3cm !important;
- background: #269DB8 !important;
+ background: #BE332F !important;
text-transform: none;
--color-checked: none;
border-radius: 100px;
- border:0;
+ border: 0;
}
-.active-Segment ion-label{
+
+.active-Segment ion-label {
font-size: 11px;
color: white !important;
}
-.normal-Segment ion-label{
+
+.normal-Segment ion-label {
color: black !important;
font-size: 11px;
}
+
.normal-Segment {
font-size: 0.3cm !important;
text-transform: none;
--color-checked: none;
border: 0;
}
+
.action-btn {
white-space: pre-wrap;
font-size: 11px;
}
-.name{
- color:black !important ;font-weight: bold;
+
+.name {
+ color: black !important;
+ font-weight: bold;
}
-.timeline-item{
+
+.timeline-item {
margin: 0;
white-space: nowrap;
font-size: 10px;
diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss
index 927b8dc3..2bde1681 100644
--- a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss
+++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss
@@ -1,7 +1,7 @@
-.header-toolbar{
- --background: #269DB8;
+.header-toolbar {
+ --background: #BE332F;
}
-ion-toggle{
- --background-checked: #269DB8;
+ion-toggle {
+ --background-checked: #BE332F;
}
\ No newline at end of file
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss
index ffb2c465..92c6a6a6 100644
--- a/Mohem/src/app/payslip/home/home.component.scss
+++ b/Mohem/src/app/payslip/home/home.component.scss
@@ -75,7 +75,7 @@
}
.header-toolbar-new {
- --background: #269DB8;
+ --background: #BE332F;
}
.colorBG {
@@ -83,7 +83,7 @@
}
.header-div {
- background-color: #269DB8;
+ background-color: #BE332F;
text-transform: capitalize;
height: 119px;
position: relative;
@@ -323,7 +323,7 @@
margin-top: 0;
margin-bottom: 0;
/* border-radius: 12px !important; */
- background: #269DB8;
+ background: #BE332F;
border-bottom: 1px solid #a7a4a4;
border-top: 1px solid #cac8c8;
margin-left: -13px;
@@ -377,7 +377,7 @@
left: 83%;
bottom: 117px;
color: black;
- background-color: #269DB8;
+ background-color: #BE332F;
width: 16%;
height: 6px;
}
@@ -387,13 +387,13 @@
// left: 77%;
// bottom: 117px;
// color: black;
- // background-color: #269DB8;
+ // background-color: #BE332F;
// width: 20%; height: 6px;
position: relative;
left: 4%;
bottom: 117px;
color: black;
- background-color: #269DB8;
+ background-color: #BE332F;
width: 15%;
height: 6px;
}
@@ -405,7 +405,7 @@
left: 83%;
bottom: 67px;
color: black;
- background-color: #269DB8;
+ background-color: #BE332F;
width: 16%;
height: 6px;
}
@@ -415,13 +415,13 @@
// left: 77%;
// bottom: 67px;
// color: black;
- // background-color: #269DB8;
+ // background-color: #BE332F;
// width: 20%; height: 6px;
position: relative;
left: 4%;
bottom: 67px;
color: black;
- background-color: #269DB8;
+ background-color: #BE332F;
width: 15%;
height: 6px;
}
\ No newline at end of file
diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts
index 8be10fe1..e8aed7a0 100644
--- a/Mohem/src/app/payslip/home/home.component.ts
+++ b/Mohem/src/app/payslip/home/home.component.ts
@@ -1,11 +1,11 @@
import { Component, OnInit, ViewChild, SimpleChanges } from '@angular/core';
-import {PayslipService} from '../service/payslip.service'
+import { PayslipService } from '../service/payslip.service'
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response';
import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service';
import { DeductionRequest } from '../model/deductionReq';
-import { IonInfiniteScroll,IonSlides} from '@ionic/angular';
+import { IonInfiniteScroll, IonSlides } from '@ionic/angular';
import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service";
import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user";
import { UIChart } from 'primeng/components/chart/chart';
@@ -19,99 +19,100 @@ export class HomeComponent implements OnInit {
selEmp: string;
respID: number;
selMenu: MenuResponse;
- GetPayslipList:any='';
- GetSummaryOfPaymentList:any='';
- GetPaymentInformationList:any='';
- showPaySlip:any=[];
- ActionContextID:any;
+ GetPayslipList: any = '';
+ GetSummaryOfPaymentList: any = '';
+ GetPaymentInformationList: any = '';
+ showPaySlip: any = [];
+ ActionContextID: any;
public static ACTION_CONTEXT_ID = "passActionContectID";
- GetEarningsList: any='';
- GetDeductionsList: any='';
+ GetEarningsList: any = '';
+ GetDeductionsList: any = '';
earingTotal: any;
deductionTotal: any;
firstPayslip: any;
defultSelected: any;
IsReachEnd: any;
private deductionReq: DeductionRequest;
- doinfiniteDedReq:any;
- doinfinitEarReq:any;
+ doinfiniteDedReq: any;
+ doinfinitEarReq: any;
personalInfo: any;
- setImage:any;
+ setImage: any;
imageSrc: any = "../assets/imgs/profile.png";
slideView: any;
sliderOne: any;
- payslipIndex :any;
- data:any;
+ payslipIndex: any;
+ data: any;
public direction: string;
@ViewChild('slides') slides: IonSlides;
@ViewChild('slideWithNav') slideWithNav: IonSlides;
- @ViewChild('chart') chart: UIChart;
+ @ViewChild('chart') chart: UIChart;
slideOptsOne = {
initialSlide: 0,
slidesPerView: 1,
- autoplay:true
+ autoplay: true
};
@ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll;
- public options = {
- cutoutPercentage: 85,
- tooltips: { enabled: false },
- legend: { display: false }};
- gaugeType = "full";
-
- // gaugeValue = 11.200;
- // gaugeLabel = "";
-
+ public options = {
+ cutoutPercentage: 85,
+ tooltips: { enabled: false },
+ legend: { display: false }
+ };
+ gaugeType = "full";
+
+ // gaugeValue = 11.200;
+ // gaugeLabel = "";
+
constructor(
- public payslipService:PayslipService,
+ public payslipService: PayslipService,
public ts: TranslatorService,
public common: CommonService,
public sharedData: SharedDataService,
public authService: AuthenticationService,
public cs: CommonService,
-
-
- ) {
- this.direction = TranslatorService.getCurrentDirection();
- }
+
+
+ ) {
+ this.direction = TranslatorService.getCurrentDirection();
+ }
ngOnInit() {
this.direction = TranslatorService.getCurrentLanguageName()
- // this.selEmp = this.common.sharedService.getSharedData(
- // MenuResponse.SHARED_SEL_EMP,
- // false
- // );
- // if(this.selEmp){}else{
- // this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => {
- // if (user) {
- // this.selEmp = user.ASSIGNMENT_NUMBER;
-
- // }
- // });
- // }
-
- // console.log(" this.selEmp" + this.selEmp);
- // this.respID = this.common.sharedService.getSharedData(
- // MenuResponse.SHARED_SEL_RESP_ID,
- // false
- // );
- // if(this.respID){}else{
- // this.respID=-999;
- // }
- // console.log(" this.respID" + this.respID);
-
- // this.selMenu = new MenuResponse();
- // this.selMenu = this.common.sharedService.getSharedData(
- // MenuResponse.SHARED_DATA,
- // false
- // );
- // console.log(" this.selMenu" + this.selMenu);
-
-
+ // this.selEmp = this.common.sharedService.getSharedData(
+ // MenuResponse.SHARED_SEL_EMP,
+ // false
+ // );
+ // if(this.selEmp){}else{
+ // this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => {
+ // if (user) {
+ // this.selEmp = user.ASSIGNMENT_NUMBER;
+
+ // }
+ // });
+ // }
+
+ // console.log(" this.selEmp" + this.selEmp);
+ // this.respID = this.common.sharedService.getSharedData(
+ // MenuResponse.SHARED_SEL_RESP_ID,
+ // false
+ // );
+ // if(this.respID){}else{
+ // this.respID=-999;
+ // }
+ // console.log(" this.respID" + this.respID);
+
+ // this.selMenu = new MenuResponse();
+ // this.selMenu = this.common.sharedService.getSharedData(
+ // MenuResponse.SHARED_DATA,
+ // false
+ // );
+ // console.log(" this.selMenu" + this.selMenu);
+
+
this.getPayslip();
- // this.getProfile();
+ // this.getProfile();
}
@@ -119,7 +120,7 @@ export class HomeComponent implements OnInit {
if (changes.inputData.currentValue) {
// update this.data here
- // then chart is getting updated
+ // then chart is getting updated
setTimeout(() => {
this.chart.reinit();
}, 100);
@@ -127,19 +128,19 @@ export class HomeComponent implements OnInit {
}
slideNext(object, slideView) {
- if(this.payslipIndex!=0){
- this.payslipIndex=this.payslipIndex-1;
- this.showInfo();
+ if (this.payslipIndex != 0) {
+ this.payslipIndex = this.payslipIndex - 1;
+ this.showInfo();
+ }
}
-}
-slidePrev(object, slideView) {
- if(this.payslipIndex {} , this.ts.trPK('general', 'retry')).subscribe((result)=>
- {
- this.handleRespondGetPayslipResult(result);
+ this.payslipService.getPayslip(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => {
+ this.handleRespondGetPayslipResult(result);
}
);
}
- handleRespondGetPayslipResult(result){
-
+ handleRespondGetPayslipResult(result) {
+
if (result.GetPayslipList != null) {
this.GetPayslipList = result.GetPayslipList;
- this.firstPayslip= this.GetPayslipList[0]
- this.defultSelected=this.firstPayslip.PAYSLIP_CHOICE
+ this.firstPayslip = this.GetPayslipList[0]
+ this.defultSelected = this.firstPayslip.PAYSLIP_CHOICE
}
this.showPaySlip = this.GetPayslipList[0];
- this.payslipIndex=0;
+ this.payslipIndex = 0;
this.getAllPayslipData(this.GetPayslipList[0].ACTION_CONTEXT_ID);
}
- showInfo(){
-
- //console.log(event.detail.value);
- //const index = parseInt(event.detail.value);
- this.showPaySlip =this.GetPayslipList[this.payslipIndex];
- this.ActionContextID=this.GetPayslipList[this.payslipIndex].ACTION_CONTEXT_ID;
- this.getAllPayslipData(this.ActionContextID);
+ showInfo() {
+
+ //console.log(event.detail.value);
+ //const index = parseInt(event.detail.value);
+ this.showPaySlip = this.GetPayslipList[this.payslipIndex];
+ this.ActionContextID = this.GetPayslipList[this.payslipIndex].ACTION_CONTEXT_ID;
+ this.getAllPayslipData(this.ActionContextID);
}
- getAllPayslipData(ActionContextID){
- this.common.sharedService.setSharedData(ActionContextID,HomeComponent.ACTION_CONTEXT_ID);
+ getAllPayslipData(ActionContextID) {
+ this.common.sharedService.setSharedData(ActionContextID, HomeComponent.ACTION_CONTEXT_ID);
this.getSummeryOfPayment(ActionContextID);
this.getPaymentInfo(ActionContextID);
this.getDeduction(ActionContextID);
this.getEarings(ActionContextID);
}
- getSummeryOfPayment(ActionContextID){
+ getSummeryOfPayment(ActionContextID) {
const request = {
P_ACTION_CONTEXT_ID: ActionContextID,
};
-
- this.payslipService.getSummeryOFPayment(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=>
- {
- this.handleSummeryOfPaymentResult(result);
+
+ this.payslipService.getSummeryOFPayment(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => {
+ this.handleSummeryOfPaymentResult(result);
}
);
}
- handleSummeryOfPaymentResult(result){
+ handleSummeryOfPaymentResult(result) {
if (result.GetSummaryOfPaymentList != null) {
this.GetSummaryOfPaymentList = result.GetSummaryOfPaymentList[0];
- this.earingTotal = this.GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT;
- this.deductionTotal = this.GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT;
+ this.earingTotal = this.GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT;
+ this.deductionTotal = this.GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT;
this.data = {
-
+
labels: ['earingTotal', 'deductionTotal'],
datasets: [
- { data: [this.earingTotal,this.deductionTotal],
- backgroundColor: [
- '#269DB8',
- '#269DB8', ],
- borderWidth: 2
- }
- ]
- }; }
+ {
+ data: [this.earingTotal, this.deductionTotal],
+ backgroundColor: [
+ '#BE332F',
+ '#BE332F',],
+ borderWidth: 2
+ }
+ ]
+ };
+ }
}
-getPaymentInfo(ActionContextID){
- const request = {
- P_ACTION_CONTEXT_ID: ActionContextID,
- };
-
- this.payslipService.getPaymentInfo(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=>
- {
- this.handleGetPaymentInfoResult(result);
- }
- );
-}
+ getPaymentInfo(ActionContextID) {
+ const request = {
+ P_ACTION_CONTEXT_ID: ActionContextID,
+ };
-handleGetPaymentInfoResult(result){
- if (result.GetPaymentInformationList != null) {
- this.GetPaymentInformationList = result.GetPaymentInformationList;
+ this.payslipService.getPaymentInfo(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => {
+ this.handleGetPaymentInfoResult(result);
+ }
+ );
}
-}
-openEarings(){
- this.common.openEarningsPage();
+ handleGetPaymentInfoResult(result) {
+ if (result.GetPaymentInformationList != null) {
+ this.GetPaymentInformationList = result.GetPaymentInformationList;
+ }
+ }
-}
-openDeductions(){
- this.common.openDeductionsPage();
-}
+ openEarings() {
+ this.common.openEarningsPage();
-getEarings(ActionContextID){
- console.log("getEarings");
-
- // this.deductionReq.P_ACTION_CONTEXT_ID=ActionContextID;
- // this.deductionReq.P_PAGE_NUM=1;
- // this.deductionReq.P_PAGE_LIMIT=100;
- const request ={
- P_ACTION_CONTEXT_ID:ActionContextID,
- P_PAGE_NUM:1,
- P_PAGE_LIMIT:100
- }
- this.doinfinitEarReq=request;
- this.payslipService.getEarings(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=>
- {
- this.handleGetEaringsResult(result);
}
- );
-}
+ openDeductions() {
+ this.common.openDeductionsPage();
+ }
+
+ getEarings(ActionContextID) {
+ console.log("getEarings");
-handleGetEaringsResult(result){
- if (result.GetEarningsList != null) {
- this.GetEarningsList = result.GetEarningsList;
+ // this.deductionReq.P_ACTION_CONTEXT_ID=ActionContextID;
+ // this.deductionReq.P_PAGE_NUM=1;
+ // this.deductionReq.P_PAGE_LIMIT=100;
+ const request = {
+ P_ACTION_CONTEXT_ID: ActionContextID,
+ P_PAGE_NUM: 1,
+ P_PAGE_LIMIT: 100
+ }
+ this.doinfinitEarReq = request;
+ this.payslipService.getEarings(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => {
+ this.handleGetEaringsResult(result);
+ }
+ );
}
+ handleGetEaringsResult(result) {
+ if (result.GetEarningsList != null) {
+ this.GetEarningsList = result.GetEarningsList;
+ }
-}
-getDeduction(ActionContextID){
- console.log("getDeduction");
- const request ={
- P_ACTION_CONTEXT_ID:ActionContextID,
- P_PAGE_NUM:1,
- P_PAGE_LIMIT:100
}
- // this.deductionReq.P_ACTION_CONTEXT_ID=ActionContextID;
- // this.deductionReq.P_PAGE_NUM=1;
- // this.deductionReq.P_PAGE_LIMIT=100;
- this.doinfiniteDedReq=request;
-
- this.payslipService.getDeduction(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=>
- {
- this.handleGetDeductionResult(result);
+
+ getDeduction(ActionContextID) {
+ console.log("getDeduction");
+ const request = {
+ P_ACTION_CONTEXT_ID: ActionContextID,
+ P_PAGE_NUM: 1,
+ P_PAGE_LIMIT: 100
+ }
+ // this.deductionReq.P_ACTION_CONTEXT_ID=ActionContextID;
+ // this.deductionReq.P_PAGE_NUM=1;
+ // this.deductionReq.P_PAGE_LIMIT=100;
+ this.doinfiniteDedReq = request;
+
+ this.payslipService.getDeduction(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => {
+ this.handleGetDeductionResult(result);
}
);
}
- handleGetDeductionResult(result){
+ handleGetDeductionResult(result) {
if (result.GetDeductionsList != null) {
this.GetDeductionsList = result.GetDeductionsList;
}
@@ -389,6 +387,6 @@ getDeduction(ActionContextID){
} else {
if (this.infiniteScroll) this.infiniteScroll.complete();
}
- }
+ }
}
diff --git a/Mohem/src/app/profile/add-address/add-address.component.scss b/Mohem/src/app/profile/add-address/add-address.component.scss
index e2348ac3..47ce98e0 100644
--- a/Mohem/src/app/profile/add-address/add-address.component.scss
+++ b/Mohem/src/app/profile/add-address/add-address.component.scss
@@ -1,44 +1,46 @@
.footer-button {
- border-radius: 2px;
- padding: 0 1.1em;
- min-height: 45px;
- min-width: 200px;
- }
-
- ion-label {
- color: var(--customnavy) !important;
- }
-
- .daynamicForm-Label {
- font-size: 16px;
- color: #a2a5a6 !important;
- display: block;
- overflow: hidden;
- -webkit-flex: 1;
- flex: 1;
- font-size: inherit;
- white-space: normal;
- padding: 5px 0px;
- margin: 10px auto;
- padding-left: 10px;
- }
-
-
- .header-toolbar-new{
- --background: #269DB8;
- }
- .addEitOkButton{
- white-space: normal !important;
- text-transform: capitalize !important;
- min-height: 45px !important;
- min-width: 5px !important;
- margin: 8px !important;
- background-color: #269DB8;
- width: 80% !important;
- color: white!important;
- border-radius: 16px !important;
- }
- .country{
- margin-top: 10px;
- padding: 10px;
- }
\ No newline at end of file
+ border-radius: 2px;
+ padding: 0 1.1em;
+ min-height: 45px;
+ min-width: 200px;
+}
+
+ion-label {
+ color: var(--customnavy) !important;
+}
+
+.daynamicForm-Label {
+ font-size: 16px;
+ color: #a2a5a6 !important;
+ display: block;
+ overflow: hidden;
+ -webkit-flex: 1;
+ flex: 1;
+ font-size: inherit;
+ white-space: normal;
+ padding: 5px 0px;
+ margin: 10px auto;
+ padding-left: 10px;
+}
+
+
+.header-toolbar-new {
+ --background: #BE332F;
+}
+
+.addEitOkButton {
+ white-space: normal !important;
+ text-transform: capitalize !important;
+ min-height: 45px !important;
+ min-width: 5px !important;
+ margin: 8px !important;
+ background-color: #BE332F;
+ width: 80% !important;
+ color: white !important;
+ border-radius: 16px !important;
+}
+
+.country {
+ margin-top: 10px;
+ padding: 10px;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss
index a6dbf815..47ce98e0 100644
--- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss
+++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss
@@ -1,45 +1,46 @@
.footer-button {
- border-radius: 2px;
- padding: 0 1.1em;
- min-height: 45px;
- min-width: 200px;
- }
-
- ion-label {
- color: var(--customnavy) !important;
- }
-
- .daynamicForm-Label {
- font-size: 16px;
- color: #a2a5a6 !important;
- display: block;
- overflow: hidden;
- -webkit-flex: 1;
- flex: 1;
- font-size: inherit;
- white-space: normal;
- padding: 5px 0px;
- margin: 10px auto;
- padding-left: 10px;
- }
-
-
- .header-toolbar-new{
- --background: #269DB8;
- }
- .addEitOkButton{
- white-space: normal !important;
- text-transform: capitalize !important;
- min-height: 45px !important;
- min-width: 5px !important;
- margin: 8px !important;
- background-color: #269DB8;
- width: 80% !important;
- color: white!important;
- border-radius: 16px !important;
- }
+ border-radius: 2px;
+ padding: 0 1.1em;
+ min-height: 45px;
+ min-width: 200px;
+}
- .country{
- margin-top: 10px;
- padding: 10px;
- }
\ No newline at end of file
+ion-label {
+ color: var(--customnavy) !important;
+}
+
+.daynamicForm-Label {
+ font-size: 16px;
+ color: #a2a5a6 !important;
+ display: block;
+ overflow: hidden;
+ -webkit-flex: 1;
+ flex: 1;
+ font-size: inherit;
+ white-space: normal;
+ padding: 5px 0px;
+ margin: 10px auto;
+ padding-left: 10px;
+}
+
+
+.header-toolbar-new {
+ --background: #BE332F;
+}
+
+.addEitOkButton {
+ white-space: normal !important;
+ text-transform: capitalize !important;
+ min-height: 45px !important;
+ min-width: 5px !important;
+ margin: 8px !important;
+ background-color: #BE332F;
+ width: 80% !important;
+ color: white !important;
+ border-radius: 16px !important;
+}
+
+.country {
+ margin-top: 10px;
+ padding: 10px;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss
index 2ed98379..a53d7d25 100644
--- a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss
+++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss
@@ -1,263 +1,273 @@
.footer-button {
- border-radius: 2px;
- padding: 0 1.1em;
- min-height: 45px;
- min-width: 200px;
- }
-
- .imgSize {
- width: 22px;
- height: 22px;
- }
-
- .Header {
- font-weight: bold;
- color: #1a586d !important;
- font-size: 10px;
- }
-
- .tbData {
- font-size: 10px;
- }
-
- .btnBack {
- background: transparent;
- float: right;
- }
-
- .attachmentDiv{
- background: #ffffff;
- height: auto;
- text-align: center;
- padding-top: 1px;
- margin: 10px;
- border-radius: 15px;
- border: 1px solid grey;
- }
-
- .noDataDiv{
- background: #ffffff;
- height: 11%;
- text-align: center;
- padding-top: 1px;
- border-radius: 10px;
- margin: 10px;
- border-radius: 5px;
- }
- .submitNote{
- background: #ffffff;
- height: 80px;
- padding-top: 1px;
- margin: 10px;
- border-radius: 15px;
- border: 1px solid grey;
- }
-
- .approvalList{
- --background: #f0efef;
- height: auto;
- text-align: center;
- padding-top: 1px;
- border-radius: 10px;
- margin: 10px;
- border-radius: 5px;
- }
-
- /************************New Design**********************************/
- .notification-list{
- background: none;
- background: none;
- border-radius: 32px;
- ion-item{
- // margin-top: 5px;
- // margin-bottom: 5px;
-
- background-color: transparent;
- .item-date{
- width: 100%;
- font-size: 16px;
- font-weight: bold;
-
- text-align: start;
- padding: 0;
- margin: 0;
-
- position: absolute;
- left: 0;
- top: 12%;
- }
- ion-label , [item-end]{
-
- white-space: normal;
- font-size: 14px;
- padding-top: 15%;
- // :root[dir="ltr"]{
- // margin-left: 10px;
- // }
- // :root[dir="rtl"]{
- // margin-right: 10px;
- // }
-
- }
-
+ border-radius: 2px;
+ padding: 0 1.1em;
+ min-height: 45px;
+ min-width: 200px;
+}
+
+.imgSize {
+ width: 22px;
+ height: 22px;
+}
+
+.Header {
+ font-weight: bold;
+ color: #c6903e !important;
+ font-size: 10px;
+}
+
+.tbData {
+ font-size: 10px;
+}
+
+.btnBack {
+ background: transparent;
+ float: right;
+}
+
+.attachmentDiv {
+ background: #ffffff;
+ height: auto;
+ text-align: center;
+ padding-top: 1px;
+ margin: 10px;
+ border-radius: 15px;
+ border: 1px solid grey;
+}
+
+.noDataDiv {
+ background: #ffffff;
+ height: 11%;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+ border-radius: 5px;
+}
+
+.submitNote {
+ background: #ffffff;
+ height: 80px;
+ padding-top: 1px;
+ margin: 10px;
+ border-radius: 15px;
+ border: 1px solid grey;
+}
+
+.approvalList {
+ --background: #f0efef;
+ height: auto;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+ border-radius: 5px;
+}
+
+/************************New Design**********************************/
+.notification-list {
+ background: none;
+ background: none;
+ border-radius: 32px;
+
+ ion-item {
+ // margin-top: 5px;
+ // margin-bottom: 5px;
+
+ background-color: transparent;
+
+ .item-date {
+ width: 100%;
+ font-size: 16px;
+ font-weight: bold;
+
+ text-align: start;
+ padding: 0;
+ margin: 0;
+
+ position: absolute;
+ left: 0;
+ top: 12%;
}
+
+ ion-label,
+ [item-end] {
+
+ white-space: normal;
+ font-size: 14px;
+ padding-top: 15%;
+ // :root[dir="ltr"]{
+ // margin-left: 10px;
+ // }
+ // :root[dir="rtl"]{
+ // margin-right: 10px;
+ // }
+
+ }
+
}
-
-
-
-
-
-
- .timeline {
- position: relative;
- margin: 15px 0 0 0;
- // border-bottom: solid 1px var(--cusgray);
- }
-
- .timeline:before {
-
- content: '';
- position: inherit !important;
- top: 0;
- bottom: 0;
- width: 4px;
- // background: #e4e4e4;
- z-index: 1;
- left: 35px;
- /* margin-left: -10px; */
- /* z-index: 1; */
- }
-
- .timeline .timeline-thumb {
-
- border-radius: 500px;
- width: 70px !important;
- z-index: 2;
- position: absolute;
- left: 0px;
- // :root[dir="ltr"]{
- // left: 37px;
- // }
- // :root[dir="rtl"]{
- // right: 37px;
- // }
- float: right;
- top: 9px;
- }
-
- .timeline .timeline-thumb.timeline-icon {
- height: 70px;
- // text-align: center;
- // color: white;
- // border: 5px solid #CBD0D3;
- // transform: scale(0.2);
- }
-
-
-
- .timeline .timeline-item {
- width: 40px;
-
- }
-
- .timeline .timeline-stats {
- position: relative;
- font-size: 12px;
- color: var(--darkgray);
-
- }
-
- .empImge{
- border-radius: 50%;
- width:100%;
- height: 100%;
- border: #dedede solid 1px;
-
- }
- .empImgeRep {
- border-radius: 50% !important;
- width: 80px;
- height: 80px;
- border: #dedede solid 1px;
- }
-
- .line{
- padding-bottom:87px;
- }
-
- .attachLable{
- position: absolute;
- top: 0px;
- z-index: 0;
- background: #30b8c6;
- color: #fff;
- border-radius: 50%;
- border: 0px;
- width: 24px;
- height: 24px;
- text-align: center;
- font-size: 5px;
- }
-
- .removeLable{
- top: 0px;
- z-index: 0;
- background: #d8252d;
- color: #fff;
- border-radius: 50%;
- border: 0px;
- width: 20px;
- height: 20px;
- text-align: center;
- font-size: 5px;
- }
-
- .note-modal {
- // width: 90%;
- // height: 50%;
- // top: 20%;
- // left: 5%;
- // right: 5%;
- // bottom: 5%;
- background: rgba(0, 0, 0, 0.5) !important;
- padding: 30% 10% !important;
- --height: 12cm !important;
- // --width: 80% !important;
- --border-radius:20px;
-
- }
- .header-toolbar-new{
- --background: #269DB8;
- }
- .title{
- margin-top: -37px;
- margin-left: 85px;
- }
- .title-ar{
- margin-top: -37px;
- margin-right: 101px;
- }
- .confirmEitOkButton{
- white-space: normal !important;
- text-transform: capitalize !important;
- min-height: 45px !important;
- min-width: 5px !important;
- margin: 8px !important;
- background-color: #269DB8;
- width: 80% !important;
- color: white!important;
- border-radius: 16px !important;
- }
-
- .approvalTitle-ar{
- font-weight: bold;
- font-size: 16px;
- text-align: right;
-
- }
- .approvalTitle{
- font-weight: bold;
- font-size: 16px;
- text-align: left;
- }
-
\ No newline at end of file
+}
+
+
+
+
+
+
+.timeline {
+ position: relative;
+ margin: 15px 0 0 0;
+ // border-bottom: solid 1px var(--cusgray);
+}
+
+.timeline:before {
+
+ content: '';
+ position: inherit !important;
+ top: 0;
+ bottom: 0;
+ width: 4px;
+ // background: #e4e4e4;
+ z-index: 1;
+ left: 35px;
+ /* margin-left: -10px; */
+ /* z-index: 1; */
+}
+
+.timeline .timeline-thumb {
+
+ border-radius: 500px;
+ width: 70px !important;
+ z-index: 2;
+ position: absolute;
+ left: 0px;
+ // :root[dir="ltr"]{
+ // left: 37px;
+ // }
+ // :root[dir="rtl"]{
+ // right: 37px;
+ // }
+ float: right;
+ top: 9px;
+}
+
+.timeline .timeline-thumb.timeline-icon {
+ height: 70px;
+ // text-align: center;
+ // color: white;
+ // border: 5px solid #CBD0D3;
+ // transform: scale(0.2);
+}
+
+
+
+.timeline .timeline-item {
+ width: 40px;
+
+}
+
+.timeline .timeline-stats {
+ position: relative;
+ font-size: 12px;
+ color: var(--darkgray);
+
+}
+
+.empImge {
+ border-radius: 50%;
+ width: 100%;
+ height: 100%;
+ border: #dedede solid 1px;
+
+}
+
+.empImgeRep {
+ border-radius: 50% !important;
+ width: 80px;
+ height: 80px;
+ border: #dedede solid 1px;
+}
+
+.line {
+ padding-bottom: 87px;
+}
+
+.attachLable {
+ position: absolute;
+ top: 0px;
+ z-index: 0;
+ background: #30b8c6;
+ color: #fff;
+ border-radius: 50%;
+ border: 0px;
+ width: 24px;
+ height: 24px;
+ text-align: center;
+ font-size: 5px;
+}
+
+.removeLable {
+ top: 0px;
+ z-index: 0;
+ background: #d8252d;
+ color: #fff;
+ border-radius: 50%;
+ border: 0px;
+ width: 20px;
+ height: 20px;
+ text-align: center;
+ font-size: 5px;
+}
+
+.note-modal {
+ // width: 90%;
+ // height: 50%;
+ // top: 20%;
+ // left: 5%;
+ // right: 5%;
+ // bottom: 5%;
+ background: rgba(0, 0, 0, 0.5) !important;
+ padding: 30% 10% !important;
+ --height: 12cm !important;
+ // --width: 80% !important;
+ --border-radius: 20px;
+
+}
+
+.header-toolbar-new {
+ --background: #BE332F;
+}
+
+.title {
+ margin-top: -37px;
+ margin-left: 85px;
+}
+
+.title-ar {
+ margin-top: -37px;
+ margin-right: 101px;
+}
+
+.confirmEitOkButton {
+ white-space: normal !important;
+ text-transform: capitalize !important;
+ min-height: 45px !important;
+ min-width: 5px !important;
+ margin: 8px !important;
+ background-color: #BE332F;
+ width: 80% !important;
+ color: white !important;
+ border-radius: 16px !important;
+}
+
+.approvalTitle-ar {
+ font-weight: bold;
+ font-size: 16px;
+ text-align: right;
+
+}
+
+.approvalTitle {
+ font-weight: bold;
+ font-size: 16px;
+ text-align: left;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss
index 2ed98379..a53d7d25 100644
--- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss
+++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss
@@ -1,263 +1,273 @@
.footer-button {
- border-radius: 2px;
- padding: 0 1.1em;
- min-height: 45px;
- min-width: 200px;
- }
-
- .imgSize {
- width: 22px;
- height: 22px;
- }
-
- .Header {
- font-weight: bold;
- color: #1a586d !important;
- font-size: 10px;
- }
-
- .tbData {
- font-size: 10px;
- }
-
- .btnBack {
- background: transparent;
- float: right;
- }
-
- .attachmentDiv{
- background: #ffffff;
- height: auto;
- text-align: center;
- padding-top: 1px;
- margin: 10px;
- border-radius: 15px;
- border: 1px solid grey;
- }
-
- .noDataDiv{
- background: #ffffff;
- height: 11%;
- text-align: center;
- padding-top: 1px;
- border-radius: 10px;
- margin: 10px;
- border-radius: 5px;
- }
- .submitNote{
- background: #ffffff;
- height: 80px;
- padding-top: 1px;
- margin: 10px;
- border-radius: 15px;
- border: 1px solid grey;
- }
-
- .approvalList{
- --background: #f0efef;
- height: auto;
- text-align: center;
- padding-top: 1px;
- border-radius: 10px;
- margin: 10px;
- border-radius: 5px;
- }
-
- /************************New Design**********************************/
- .notification-list{
- background: none;
- background: none;
- border-radius: 32px;
- ion-item{
- // margin-top: 5px;
- // margin-bottom: 5px;
-
- background-color: transparent;
- .item-date{
- width: 100%;
- font-size: 16px;
- font-weight: bold;
-
- text-align: start;
- padding: 0;
- margin: 0;
-
- position: absolute;
- left: 0;
- top: 12%;
- }
- ion-label , [item-end]{
-
- white-space: normal;
- font-size: 14px;
- padding-top: 15%;
- // :root[dir="ltr"]{
- // margin-left: 10px;
- // }
- // :root[dir="rtl"]{
- // margin-right: 10px;
- // }
-
- }
-
+ border-radius: 2px;
+ padding: 0 1.1em;
+ min-height: 45px;
+ min-width: 200px;
+}
+
+.imgSize {
+ width: 22px;
+ height: 22px;
+}
+
+.Header {
+ font-weight: bold;
+ color: #c6903e !important;
+ font-size: 10px;
+}
+
+.tbData {
+ font-size: 10px;
+}
+
+.btnBack {
+ background: transparent;
+ float: right;
+}
+
+.attachmentDiv {
+ background: #ffffff;
+ height: auto;
+ text-align: center;
+ padding-top: 1px;
+ margin: 10px;
+ border-radius: 15px;
+ border: 1px solid grey;
+}
+
+.noDataDiv {
+ background: #ffffff;
+ height: 11%;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+ border-radius: 5px;
+}
+
+.submitNote {
+ background: #ffffff;
+ height: 80px;
+ padding-top: 1px;
+ margin: 10px;
+ border-radius: 15px;
+ border: 1px solid grey;
+}
+
+.approvalList {
+ --background: #f0efef;
+ height: auto;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+ border-radius: 5px;
+}
+
+/************************New Design**********************************/
+.notification-list {
+ background: none;
+ background: none;
+ border-radius: 32px;
+
+ ion-item {
+ // margin-top: 5px;
+ // margin-bottom: 5px;
+
+ background-color: transparent;
+
+ .item-date {
+ width: 100%;
+ font-size: 16px;
+ font-weight: bold;
+
+ text-align: start;
+ padding: 0;
+ margin: 0;
+
+ position: absolute;
+ left: 0;
+ top: 12%;
}
+
+ ion-label,
+ [item-end] {
+
+ white-space: normal;
+ font-size: 14px;
+ padding-top: 15%;
+ // :root[dir="ltr"]{
+ // margin-left: 10px;
+ // }
+ // :root[dir="rtl"]{
+ // margin-right: 10px;
+ // }
+
+ }
+
}
-
-
-
-
-
-
- .timeline {
- position: relative;
- margin: 15px 0 0 0;
- // border-bottom: solid 1px var(--cusgray);
- }
-
- .timeline:before {
-
- content: '';
- position: inherit !important;
- top: 0;
- bottom: 0;
- width: 4px;
- // background: #e4e4e4;
- z-index: 1;
- left: 35px;
- /* margin-left: -10px; */
- /* z-index: 1; */
- }
-
- .timeline .timeline-thumb {
-
- border-radius: 500px;
- width: 70px !important;
- z-index: 2;
- position: absolute;
- left: 0px;
- // :root[dir="ltr"]{
- // left: 37px;
- // }
- // :root[dir="rtl"]{
- // right: 37px;
- // }
- float: right;
- top: 9px;
- }
-
- .timeline .timeline-thumb.timeline-icon {
- height: 70px;
- // text-align: center;
- // color: white;
- // border: 5px solid #CBD0D3;
- // transform: scale(0.2);
- }
-
-
-
- .timeline .timeline-item {
- width: 40px;
-
- }
-
- .timeline .timeline-stats {
- position: relative;
- font-size: 12px;
- color: var(--darkgray);
-
- }
-
- .empImge{
- border-radius: 50%;
- width:100%;
- height: 100%;
- border: #dedede solid 1px;
-
- }
- .empImgeRep {
- border-radius: 50% !important;
- width: 80px;
- height: 80px;
- border: #dedede solid 1px;
- }
-
- .line{
- padding-bottom:87px;
- }
-
- .attachLable{
- position: absolute;
- top: 0px;
- z-index: 0;
- background: #30b8c6;
- color: #fff;
- border-radius: 50%;
- border: 0px;
- width: 24px;
- height: 24px;
- text-align: center;
- font-size: 5px;
- }
-
- .removeLable{
- top: 0px;
- z-index: 0;
- background: #d8252d;
- color: #fff;
- border-radius: 50%;
- border: 0px;
- width: 20px;
- height: 20px;
- text-align: center;
- font-size: 5px;
- }
-
- .note-modal {
- // width: 90%;
- // height: 50%;
- // top: 20%;
- // left: 5%;
- // right: 5%;
- // bottom: 5%;
- background: rgba(0, 0, 0, 0.5) !important;
- padding: 30% 10% !important;
- --height: 12cm !important;
- // --width: 80% !important;
- --border-radius:20px;
-
- }
- .header-toolbar-new{
- --background: #269DB8;
- }
- .title{
- margin-top: -37px;
- margin-left: 85px;
- }
- .title-ar{
- margin-top: -37px;
- margin-right: 101px;
- }
- .confirmEitOkButton{
- white-space: normal !important;
- text-transform: capitalize !important;
- min-height: 45px !important;
- min-width: 5px !important;
- margin: 8px !important;
- background-color: #269DB8;
- width: 80% !important;
- color: white!important;
- border-radius: 16px !important;
- }
-
- .approvalTitle-ar{
- font-weight: bold;
- font-size: 16px;
- text-align: right;
-
- }
- .approvalTitle{
- font-weight: bold;
- font-size: 16px;
- text-align: left;
- }
-
\ No newline at end of file
+}
+
+
+
+
+
+
+.timeline {
+ position: relative;
+ margin: 15px 0 0 0;
+ // border-bottom: solid 1px var(--cusgray);
+}
+
+.timeline:before {
+
+ content: '';
+ position: inherit !important;
+ top: 0;
+ bottom: 0;
+ width: 4px;
+ // background: #e4e4e4;
+ z-index: 1;
+ left: 35px;
+ /* margin-left: -10px; */
+ /* z-index: 1; */
+}
+
+.timeline .timeline-thumb {
+
+ border-radius: 500px;
+ width: 70px !important;
+ z-index: 2;
+ position: absolute;
+ left: 0px;
+ // :root[dir="ltr"]{
+ // left: 37px;
+ // }
+ // :root[dir="rtl"]{
+ // right: 37px;
+ // }
+ float: right;
+ top: 9px;
+}
+
+.timeline .timeline-thumb.timeline-icon {
+ height: 70px;
+ // text-align: center;
+ // color: white;
+ // border: 5px solid #CBD0D3;
+ // transform: scale(0.2);
+}
+
+
+
+.timeline .timeline-item {
+ width: 40px;
+
+}
+
+.timeline .timeline-stats {
+ position: relative;
+ font-size: 12px;
+ color: var(--darkgray);
+
+}
+
+.empImge {
+ border-radius: 50%;
+ width: 100%;
+ height: 100%;
+ border: #dedede solid 1px;
+
+}
+
+.empImgeRep {
+ border-radius: 50% !important;
+ width: 80px;
+ height: 80px;
+ border: #dedede solid 1px;
+}
+
+.line {
+ padding-bottom: 87px;
+}
+
+.attachLable {
+ position: absolute;
+ top: 0px;
+ z-index: 0;
+ background: #30b8c6;
+ color: #fff;
+ border-radius: 50%;
+ border: 0px;
+ width: 24px;
+ height: 24px;
+ text-align: center;
+ font-size: 5px;
+}
+
+.removeLable {
+ top: 0px;
+ z-index: 0;
+ background: #d8252d;
+ color: #fff;
+ border-radius: 50%;
+ border: 0px;
+ width: 20px;
+ height: 20px;
+ text-align: center;
+ font-size: 5px;
+}
+
+.note-modal {
+ // width: 90%;
+ // height: 50%;
+ // top: 20%;
+ // left: 5%;
+ // right: 5%;
+ // bottom: 5%;
+ background: rgba(0, 0, 0, 0.5) !important;
+ padding: 30% 10% !important;
+ --height: 12cm !important;
+ // --width: 80% !important;
+ --border-radius: 20px;
+
+}
+
+.header-toolbar-new {
+ --background: #BE332F;
+}
+
+.title {
+ margin-top: -37px;
+ margin-left: 85px;
+}
+
+.title-ar {
+ margin-top: -37px;
+ margin-right: 101px;
+}
+
+.confirmEitOkButton {
+ white-space: normal !important;
+ text-transform: capitalize !important;
+ min-height: 45px !important;
+ min-width: 5px !important;
+ margin: 8px !important;
+ background-color: #BE332F;
+ width: 80% !important;
+ color: white !important;
+ border-radius: 16px !important;
+}
+
+.approvalTitle-ar {
+ font-weight: bold;
+ font-size: 16px;
+ text-align: right;
+
+}
+
+.approvalTitle {
+ font-weight: bold;
+ font-size: 16px;
+ text-align: left;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss
index 2ed98379..a53d7d25 100644
--- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss
+++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss
@@ -1,263 +1,273 @@
.footer-button {
- border-radius: 2px;
- padding: 0 1.1em;
- min-height: 45px;
- min-width: 200px;
- }
-
- .imgSize {
- width: 22px;
- height: 22px;
- }
-
- .Header {
- font-weight: bold;
- color: #1a586d !important;
- font-size: 10px;
- }
-
- .tbData {
- font-size: 10px;
- }
-
- .btnBack {
- background: transparent;
- float: right;
- }
-
- .attachmentDiv{
- background: #ffffff;
- height: auto;
- text-align: center;
- padding-top: 1px;
- margin: 10px;
- border-radius: 15px;
- border: 1px solid grey;
- }
-
- .noDataDiv{
- background: #ffffff;
- height: 11%;
- text-align: center;
- padding-top: 1px;
- border-radius: 10px;
- margin: 10px;
- border-radius: 5px;
- }
- .submitNote{
- background: #ffffff;
- height: 80px;
- padding-top: 1px;
- margin: 10px;
- border-radius: 15px;
- border: 1px solid grey;
- }
-
- .approvalList{
- --background: #f0efef;
- height: auto;
- text-align: center;
- padding-top: 1px;
- border-radius: 10px;
- margin: 10px;
- border-radius: 5px;
- }
-
- /************************New Design**********************************/
- .notification-list{
- background: none;
- background: none;
- border-radius: 32px;
- ion-item{
- // margin-top: 5px;
- // margin-bottom: 5px;
-
- background-color: transparent;
- .item-date{
- width: 100%;
- font-size: 16px;
- font-weight: bold;
-
- text-align: start;
- padding: 0;
- margin: 0;
-
- position: absolute;
- left: 0;
- top: 12%;
- }
- ion-label , [item-end]{
-
- white-space: normal;
- font-size: 14px;
- padding-top: 15%;
- // :root[dir="ltr"]{
- // margin-left: 10px;
- // }
- // :root[dir="rtl"]{
- // margin-right: 10px;
- // }
-
- }
-
+ border-radius: 2px;
+ padding: 0 1.1em;
+ min-height: 45px;
+ min-width: 200px;
+}
+
+.imgSize {
+ width: 22px;
+ height: 22px;
+}
+
+.Header {
+ font-weight: bold;
+ color: #c6903e !important;
+ font-size: 10px;
+}
+
+.tbData {
+ font-size: 10px;
+}
+
+.btnBack {
+ background: transparent;
+ float: right;
+}
+
+.attachmentDiv {
+ background: #ffffff;
+ height: auto;
+ text-align: center;
+ padding-top: 1px;
+ margin: 10px;
+ border-radius: 15px;
+ border: 1px solid grey;
+}
+
+.noDataDiv {
+ background: #ffffff;
+ height: 11%;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+ border-radius: 5px;
+}
+
+.submitNote {
+ background: #ffffff;
+ height: 80px;
+ padding-top: 1px;
+ margin: 10px;
+ border-radius: 15px;
+ border: 1px solid grey;
+}
+
+.approvalList {
+ --background: #f0efef;
+ height: auto;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+ border-radius: 5px;
+}
+
+/************************New Design**********************************/
+.notification-list {
+ background: none;
+ background: none;
+ border-radius: 32px;
+
+ ion-item {
+ // margin-top: 5px;
+ // margin-bottom: 5px;
+
+ background-color: transparent;
+
+ .item-date {
+ width: 100%;
+ font-size: 16px;
+ font-weight: bold;
+
+ text-align: start;
+ padding: 0;
+ margin: 0;
+
+ position: absolute;
+ left: 0;
+ top: 12%;
}
+
+ ion-label,
+ [item-end] {
+
+ white-space: normal;
+ font-size: 14px;
+ padding-top: 15%;
+ // :root[dir="ltr"]{
+ // margin-left: 10px;
+ // }
+ // :root[dir="rtl"]{
+ // margin-right: 10px;
+ // }
+
+ }
+
}
-
-
-
-
-
-
- .timeline {
- position: relative;
- margin: 15px 0 0 0;
- // border-bottom: solid 1px var(--cusgray);
- }
-
- .timeline:before {
-
- content: '';
- position: inherit !important;
- top: 0;
- bottom: 0;
- width: 4px;
- // background: #e4e4e4;
- z-index: 1;
- left: 35px;
- /* margin-left: -10px; */
- /* z-index: 1; */
- }
-
- .timeline .timeline-thumb {
-
- border-radius: 500px;
- width: 70px !important;
- z-index: 2;
- position: absolute;
- left: 0px;
- // :root[dir="ltr"]{
- // left: 37px;
- // }
- // :root[dir="rtl"]{
- // right: 37px;
- // }
- float: right;
- top: 9px;
- }
-
- .timeline .timeline-thumb.timeline-icon {
- height: 70px;
- // text-align: center;
- // color: white;
- // border: 5px solid #CBD0D3;
- // transform: scale(0.2);
- }
-
-
-
- .timeline .timeline-item {
- width: 40px;
-
- }
-
- .timeline .timeline-stats {
- position: relative;
- font-size: 12px;
- color: var(--darkgray);
-
- }
-
- .empImge{
- border-radius: 50%;
- width:100%;
- height: 100%;
- border: #dedede solid 1px;
-
- }
- .empImgeRep {
- border-radius: 50% !important;
- width: 80px;
- height: 80px;
- border: #dedede solid 1px;
- }
-
- .line{
- padding-bottom:87px;
- }
-
- .attachLable{
- position: absolute;
- top: 0px;
- z-index: 0;
- background: #30b8c6;
- color: #fff;
- border-radius: 50%;
- border: 0px;
- width: 24px;
- height: 24px;
- text-align: center;
- font-size: 5px;
- }
-
- .removeLable{
- top: 0px;
- z-index: 0;
- background: #d8252d;
- color: #fff;
- border-radius: 50%;
- border: 0px;
- width: 20px;
- height: 20px;
- text-align: center;
- font-size: 5px;
- }
-
- .note-modal {
- // width: 90%;
- // height: 50%;
- // top: 20%;
- // left: 5%;
- // right: 5%;
- // bottom: 5%;
- background: rgba(0, 0, 0, 0.5) !important;
- padding: 30% 10% !important;
- --height: 12cm !important;
- // --width: 80% !important;
- --border-radius:20px;
-
- }
- .header-toolbar-new{
- --background: #269DB8;
- }
- .title{
- margin-top: -37px;
- margin-left: 85px;
- }
- .title-ar{
- margin-top: -37px;
- margin-right: 101px;
- }
- .confirmEitOkButton{
- white-space: normal !important;
- text-transform: capitalize !important;
- min-height: 45px !important;
- min-width: 5px !important;
- margin: 8px !important;
- background-color: #269DB8;
- width: 80% !important;
- color: white!important;
- border-radius: 16px !important;
- }
-
- .approvalTitle-ar{
- font-weight: bold;
- font-size: 16px;
- text-align: right;
-
- }
- .approvalTitle{
- font-weight: bold;
- font-size: 16px;
- text-align: left;
- }
-
\ No newline at end of file
+}
+
+
+
+
+
+
+.timeline {
+ position: relative;
+ margin: 15px 0 0 0;
+ // border-bottom: solid 1px var(--cusgray);
+}
+
+.timeline:before {
+
+ content: '';
+ position: inherit !important;
+ top: 0;
+ bottom: 0;
+ width: 4px;
+ // background: #e4e4e4;
+ z-index: 1;
+ left: 35px;
+ /* margin-left: -10px; */
+ /* z-index: 1; */
+}
+
+.timeline .timeline-thumb {
+
+ border-radius: 500px;
+ width: 70px !important;
+ z-index: 2;
+ position: absolute;
+ left: 0px;
+ // :root[dir="ltr"]{
+ // left: 37px;
+ // }
+ // :root[dir="rtl"]{
+ // right: 37px;
+ // }
+ float: right;
+ top: 9px;
+}
+
+.timeline .timeline-thumb.timeline-icon {
+ height: 70px;
+ // text-align: center;
+ // color: white;
+ // border: 5px solid #CBD0D3;
+ // transform: scale(0.2);
+}
+
+
+
+.timeline .timeline-item {
+ width: 40px;
+
+}
+
+.timeline .timeline-stats {
+ position: relative;
+ font-size: 12px;
+ color: var(--darkgray);
+
+}
+
+.empImge {
+ border-radius: 50%;
+ width: 100%;
+ height: 100%;
+ border: #dedede solid 1px;
+
+}
+
+.empImgeRep {
+ border-radius: 50% !important;
+ width: 80px;
+ height: 80px;
+ border: #dedede solid 1px;
+}
+
+.line {
+ padding-bottom: 87px;
+}
+
+.attachLable {
+ position: absolute;
+ top: 0px;
+ z-index: 0;
+ background: #30b8c6;
+ color: #fff;
+ border-radius: 50%;
+ border: 0px;
+ width: 24px;
+ height: 24px;
+ text-align: center;
+ font-size: 5px;
+}
+
+.removeLable {
+ top: 0px;
+ z-index: 0;
+ background: #d8252d;
+ color: #fff;
+ border-radius: 50%;
+ border: 0px;
+ width: 20px;
+ height: 20px;
+ text-align: center;
+ font-size: 5px;
+}
+
+.note-modal {
+ // width: 90%;
+ // height: 50%;
+ // top: 20%;
+ // left: 5%;
+ // right: 5%;
+ // bottom: 5%;
+ background: rgba(0, 0, 0, 0.5) !important;
+ padding: 30% 10% !important;
+ --height: 12cm !important;
+ // --width: 80% !important;
+ --border-radius: 20px;
+
+}
+
+.header-toolbar-new {
+ --background: #BE332F;
+}
+
+.title {
+ margin-top: -37px;
+ margin-left: 85px;
+}
+
+.title-ar {
+ margin-top: -37px;
+ margin-right: 101px;
+}
+
+.confirmEitOkButton {
+ white-space: normal !important;
+ text-transform: capitalize !important;
+ min-height: 45px !important;
+ min-width: 5px !important;
+ margin: 8px !important;
+ background-color: #BE332F;
+ width: 80% !important;
+ color: white !important;
+ border-radius: 16px !important;
+}
+
+.approvalTitle-ar {
+ font-weight: bold;
+ font-size: 16px;
+ text-align: right;
+
+}
+
+.approvalTitle {
+ font-weight: bold;
+ font-size: 16px;
+ text-align: left;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss
index 85728b60..bfeb8399 100644
--- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss
+++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss
@@ -1,13 +1,15 @@
-ion-col.colBold, ion-col.colBold > label{
- font-weight:bold;
+ion-col.colBold,
+ion-col.colBold>label {
+ font-weight: bold;
}
-.colorBG{
---background: #f0efef;
+.colorBG {
+ --background: #f0efef;
}
-.header-div{
+
+.header-div {
text-transform: capitalize;
- background: #269DB8;
+ background: #BE332F;
display: block;
position: relative;
height: 160px;
@@ -19,36 +21,38 @@ ion-col.colBold, ion-col.colBold > label{
.menubutton {
-background: #f0ecec;
-min-height: 39px;
-width: 35px !important;
-height: 20px;
-border-radius: 50%;
+ background: #f0ecec;
+ min-height: 39px;
+ width: 35px !important;
+ height: 20px;
+ border-radius: 50%;
}
-.changeIcon{
- /* background: #c1c1c1; */
- width: 21px;
- /* height: 26px; */
- border-radius: 50% !important;
- position: relative;
- color: #7f8c8d;
- height: 35px;
+.changeIcon {
+ /* background: #c1c1c1; */
+ width: 21px;
+ /* height: 26px; */
+ border-radius: 50% !important;
+ position: relative;
+ color: #7f8c8d;
+ height: 35px;
+
-
}
-.changeImgBtn{
+.changeImgBtn {
position: absolute;
top: 80%;
left: 65%;
}
-.changeImgBtn-ar{
+
+.changeImgBtn-ar {
position: absolute;
top: 80%;
left: 66%;
}
-.profileImg{
+
+.profileImg {
width: 160px;
height: 160px;
display: -webkit-inline-box;
@@ -73,27 +77,28 @@ border-radius: 50%;
text-align: center;
}
-.line{
+.line {
padding-top: 0px !important;
/* margin-bottom: 0px; */
/* margin: 0px; */
border-right: 1px #c5c2c2 solid !important;
line-height: 10px !important;
-
+
}
+
.proTitles {
margin: 0;
padding: 0;
font-size: 16px;
text-align: center;
font-weight: bolder;
- color: white;
+ color: white;
margin-top: -33px;
}
-.profileGrid{
+.profileGrid {
border: #bebbbb solid 1px;
border-radius: 9px;
padding: 0px;
@@ -110,16 +115,17 @@ border-radius: 50%;
-.lebl{
+.lebl {
color: black;
font-size: 14px !important;
font-weight: bold !important;
padding-top: 9px;
padding-left: 5px;
-
+
}
-.rowBolds{
+
+.rowBolds {
color: black !important;
font-size: 14px !important;
/* padding: 6px !important; */
diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss
index 8920347a..be86526a 100644
--- a/Mohem/src/app/profile/home/home.component.scss
+++ b/Mohem/src/app/profile/home/home.component.scss
@@ -15,14 +15,16 @@
}
.header-toolbar-new {
- --background: #269db8;
+ --background: #BE332F;
}
+
.colorBG {
--background: #f0efef;
}
+
.header-div {
text-transform: capitalize;
- background: #269db8;
+ background: #BE332F;
display: block;
position: relative;
height: 113px;
@@ -84,6 +86,7 @@ ion-thumbnail.menu-thumb {
// margin-left: 30px;
// margin-right: 30px;
}
+
.gridService-ar {
// margin-top: 87px;
// border-radius: 10px;
@@ -101,6 +104,7 @@ ion-thumbnail.menu-thumb {
// padding-top: 19px;
// padding-bottom: 26px;
}
+
.columns-ar {
// margin: 10px;
// background: #0B4775;
@@ -119,10 +123,12 @@ ion-thumbnail.menu-thumb {
// font-weight: bold;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
}
+
.services {
font-size: 12px;
color: white;
}
+
.service-ar {
font-size: 20px;
color: white;
@@ -130,6 +136,7 @@ ion-thumbnail.menu-thumb {
font-weight: bold;
margin-right: 10px;
}
+
.services-ar {
font-size: 20px;
color: white;
@@ -144,19 +151,23 @@ ion-thumbnail.menu-thumb {
border: #bebbbb !important;
padding: 2px;
}
+
.p {
color: black !important;
font-size: medium;
text-align: center;
border-bottom: rgb(190, 187, 187) solid 1px;
}
+
.itemline {
border-bottom: rgb(190, 187, 187) solid 1px;
}
+
.itemlins {
border-bottom: rgb(190, 187, 187) solid 1px;
margin-bottom: 209px;
}
+
.empName {
margin: 0;
padding: 0;
@@ -166,6 +177,7 @@ ion-thumbnail.menu-thumb {
font-size: 16px;
margin-top: 38px;
}
+
.empJob {
margin: 0;
padding: 0;
@@ -174,10 +186,12 @@ ion-thumbnail.menu-thumb {
font-size: 16px;
margin-top: 4px;
}
+
.arrow {
width: 20px;
height: 22px !important;
}
+
.arrow-ar {
float: left;
font-size: 25px;
@@ -198,6 +212,7 @@ ion-thumbnail.menu-thumb {
width: 85%;
margin: -12px 0px 0px 25px;
}
+
.service-row-ar {
width: 104%;
margin: -12px 0px 0px 0px;
@@ -206,6 +221,7 @@ ion-thumbnail.menu-thumb {
ion-content {
--ion-background-color: whitesmoke;
}
+
ion-title {
color: white;
position: absolute;
@@ -218,6 +234,7 @@ ion-title {
height: 100%;
font-family: WorkSans-Regular;
}
+
.contentBg {
padding: 0px 20px;
}
@@ -225,7 +242,7 @@ ion-title {
.contentBg:before {
position: absolute;
content: "";
- background: #269db8;
+ background: #BE332F;
height: 140px;
width: 100%;
left: 0;
@@ -236,6 +253,7 @@ ion-title {
.user-info {
text-align: center;
margin-bottom: 15px;
+
.user-image-container {
position: relative;
width: 100%;
@@ -245,6 +263,7 @@ ion-title {
margin: 0 auto;
align-items: center;
}
+
// position: relative;
// width: 80px;
// height: 80px;
@@ -278,6 +297,7 @@ ion-title {
margin-top: -125px;
}
}
+
@media screen and (min-width: 768px) and (max-width: 1024px) {
.user-image {
// position: relative;
@@ -307,6 +327,7 @@ ion-title {
margin-top: -125px;
}
}
+
@media screen and (min-width: 768px) and (max-width: 1024px) {
.user-image-ar {
// position: relative;
@@ -322,7 +343,9 @@ ion-title {
border-radius: 80px;
margin-bottom: 321px;
margin-right: 52px;
- }}
+ }
+}
+
h1 {
margin: 0;
padding: 0;
@@ -330,6 +353,7 @@ h1 {
font-size: 18px;
margin-bottom: 4px;
}
+
span {
font-size: 11px;
display: block;
@@ -337,11 +361,14 @@ span {
}
$actionBtnSize: 36px;
+
.user-actions {
text-align: center;
+
.action-button {
font-size: 11px;
font-weight: bold;
+
// white-space: nowrap;
// color: #888;
.action-button-icon {
@@ -350,9 +377,10 @@ $actionBtnSize: 36px;
border-radius: $actionBtnSize;
margin: 0 auto;
display: block;
- background-color: #269db8;
+ background-color: #BE332F;
line-height: $actionBtnSize;
margin-bottom: 3px;
+
img {
margin: 0 auto;
vertical-align: middle;
@@ -360,6 +388,7 @@ $actionBtnSize: 36px;
}
}
}
+
.employee-information-indetail {
background: white;
margin-top: 15px;
@@ -367,10 +396,12 @@ $actionBtnSize: 36px;
margin-bottom: 15px;
border-radius: 20px;
border: 1px solid #ccc;
+
ion-col {
padding: 15px;
// border-bottom: 1px solid #ccc;
}
+
h2 {
font-size: 13px;
// font-family: WorkSans-Bold;
@@ -378,6 +409,7 @@ $actionBtnSize: 36px;
font-weight: bold;
color: rgb(128, 124, 124);
}
+
p {
font-size: 13px;
margin: 0;
@@ -405,9 +437,10 @@ $actionBtnSize: 36px;
border-radius: 50% !important;
margin-right: 22px;
margin-left: 22px;
- background-color: #269db8;
+ background-color: #BE332F;
}
}
+
@media screen and (min-width: 768px) and (max-width: 1024px) {
.active-Segment {
width: 11%;
@@ -419,7 +452,7 @@ $actionBtnSize: 36px;
border-radius: 50% !important;
margin-right: 62px;
margin-left: 45px;
- background: #269db8 !important;
+ background: #BE332F !important;
padding-left: 17px;
}
}
@@ -438,6 +471,7 @@ $actionBtnSize: 36px;
background: #414040 !important;
}
}
+
@media screen and (min-width: 768px) and (max-width: 1024px) {
.normal-Segment {
width: 11%;
@@ -465,6 +499,7 @@ $actionBtnSize: 36px;
height: 18px;
}
}
+
@media screen and (min-width: 768px) and (max-width: 1024px) {
.imgSize {
position: absolute;
@@ -480,6 +515,7 @@ $actionBtnSize: 36px;
padding: 15px;
border-bottom: 1px solid #ccc;
}
+
.img {
width: 100px;
height: 100px;
@@ -491,6 +527,7 @@ $actionBtnSize: 36px;
background: transparent;
margin-left: 119%;
}
+
.img-ar {
width: 100px;
height: 100px;
@@ -502,6 +539,7 @@ $actionBtnSize: 36px;
background: transparent;
margin-right: 119%;
}
+
///////////////////////// Team Members css //////////////////////@extend
.filters-row {
@@ -509,11 +547,13 @@ $actionBtnSize: 36px;
}
.search-dropdown {
- background: #269db8;
+ background: #BE332F;
+
ion-select {
.select-text {
margin-left: -10px;
}
+
.select-icon {
.select-icon-inner {
opacity: 1;
@@ -526,6 +566,7 @@ $actionBtnSize: 36px;
.input-container {
background: white;
+
ion-input {
border-bottom-color: transparent;
}
@@ -533,17 +574,20 @@ $actionBtnSize: 36px;
.search-container {
margin-top: 15px;
+
ion-col {
background: white;
border-radius: 12px;
padding-right: 10px;
flex: none;
+
ion-icon {
margin-right: 3px;
font-size: 14px;
margin-left: 3px;
vertical-align: middle;
}
+
span {
font-size: 12px;
vertical-align: middle;
@@ -567,11 +611,13 @@ $actionBtnSize: 36px;
margin-top: -1px;
margin-left: 43px;
}
+
.activeArrow {
height: 20px;
width: 20px;
- color: #269db8;
+ color: #BE332F;
}
+
.disabledArrow {
height: 20px;
width: 20px;
@@ -581,9 +627,10 @@ $actionBtnSize: 36px;
.activeArrow-ar {
height: 20px;
width: 20px;
- color: #269db8;
+ color: #BE332F;
margin-right: 275px;
}
+
.disabledArrow-ar {
height: 20px;
width: 20px;
@@ -608,6 +655,7 @@ $actionBtnSize: 36px;
width: 90%;
left: 5%;
}
+
.result-graph-ar {
position: relative;
background: white;
@@ -658,6 +706,7 @@ $actionBtnSize: 36px;
right: 5%;
}
}
+
.result-graph-attendence {
position: relative;
background: white;
@@ -678,6 +727,7 @@ $actionBtnSize: 36px;
margin-bottom: 10px;
margin-left: 10px;
}
+
.request-heading-ar {
text-align: right;
display: block;
@@ -695,12 +745,14 @@ $actionBtnSize: 36px;
display: block;
text-align: center;
transform: translate(-50%, -50%);
+
h2 {
font-size: 38px;
font-family: WorkSans-Bold;
margin: 0 auto;
line-height: 36px;
}
+
span {
width: 125px;
display: block;
@@ -709,6 +761,7 @@ $actionBtnSize: 36px;
font-family: workSans-Regular;
}
}
+
.today-graph {
// width: 100%;
max-height: 4cm;
@@ -753,6 +806,7 @@ $actionBtnSize: 36px;
line-height: 11px !important;
display: block;
}
+
h2 {
font-size: 25px;
font-weight: bold;
@@ -790,6 +844,7 @@ $actionBtnSize: 36px;
margin: 0;
font-size: 14px;
}
+
span {
font-size: 9px;
}
@@ -801,6 +856,7 @@ $actionBtnSize: 36px;
margin: 0;
font-size: 14px;
}
+
span {
font-size: 11px;
margin-bottom: 3px;
@@ -815,14 +871,14 @@ $actionBtnSize: 36px;
}
.green-label-container {
- // border-top: 5px solid #269DB8;
+ // border-top: 5px solid #BE332F;
// padding: 1px 0px;
// margin: 15px 0px
width: 12px;
height: 12px;
padding-right: -10px;
border-radius: 100%;
- background-color: #269db8;
+ background-color: #BE332F;
}
.blue-label-container {
@@ -836,6 +892,7 @@ $actionBtnSize: 36px;
background-color: #292f42;
margin-top: 30px;
}
+
.span-one {
// display: block;
// font-size: 12px;
@@ -847,6 +904,7 @@ $actionBtnSize: 36px;
margin-top: -2px;
font-weight: bold;
}
+
.span-two {
// display: block;
// font-size: 22px;
@@ -870,6 +928,7 @@ $actionBtnSize: 36px;
margin-top: 28px;
font-weight: bold;
}
+
.spa-two {
// display: block;
// font-size: 22px;
@@ -881,11 +940,13 @@ $actionBtnSize: 36px;
font-weight: bold;
font-family: WorkSans-Bold;
}
+
.graph-container {
margin-left: -50px;
position: relative;
margin-right: 50px;
}
+
.label-container {
position: absolute;
// width: 20%;
@@ -894,12 +955,14 @@ $actionBtnSize: 36px;
margin-top: -27px;
left: 20px;
}
+
.attendance-summary .attendance-information {
span {
height: 32px;
display: block;
line-height: 14px;
}
+
h2 {
// text-align: right;
// font-family: WorkSans-Bold;
@@ -915,6 +978,7 @@ $actionBtnSize: 36px;
border-radius: 20px;
border: 1px solid #ccc;
padding-bottom: 25px;
+
span {
text-align: left;
display: block;
@@ -923,11 +987,13 @@ $actionBtnSize: 36px;
margin-left: 10px;
}
}
+
.calendar-container-ar {
background: white;
margin-bottom: 100px;
margin-top: 20px;
border-radius: 20px;
+
span {
text-align: right;
display: block;
@@ -958,6 +1024,7 @@ $actionBtnSize: 36px;
font-family: WorkSans-Bold;
font-size: 16px;
}
+
.stats {
color: #289db8;
font-size: 9px;
@@ -977,7 +1044,7 @@ $actionBtnSize: 36px;
height: 20px;
padding-right: -10px;
border-radius: 100%;
- background-color: #269db8;
+ background-color: #BE332F;
z-index: 9;
margin-top: 26px;
}
@@ -1005,7 +1072,7 @@ $actionBtnSize: 36px;
.header-background-style-card {
padding-top: 1px;
- background: #269db8;
+ background: #BE332F;
height: 115px;
}
@@ -1013,66 +1080,63 @@ $actionBtnSize: 36px;
text-align: center;
width: 20px;
}
-@media screen and (min-width: 1px) and (max-width:766px){
-.grid-card {
- right: 5px;
- position: relative;
- display: block;
- z-index: 5;
- width: 103%;
-}}
-@media screen and (min-width: 1px) and (max-width:766px){
-.grid-card-ar {
- left: 5px;
- position: relative;
- display: block;
- z-index: 5;
- width: 103%;
-}}
-@media screen and (min-width: 768px) and (max-width:1050px){
-.grid-card {
- right: 5px;
- position: relative;
- display: block;
- z-index: 5;
- width: 101%;
-}}
-@media screen and (min-width: 768px) and (max-width:1050px){
-.grid-card-ar {
- left: 5px;
- position: relative;
- display: block;
- z-index: 5;
- width: 101%;
-}}
-@media screen and (min-width: 1px) and (max-width:766px){
-.changeImgBtn {
- position: absolute;
- background: #f0ecec;
- min-height: 25px;
- width: 24px !important;
- height: 20px;
- border-radius: 50%;
- bottom: 55px;
- right: 36%;
- top: -15%;
- z-index: 99;
-}}
-@media screen and (min-width: 768px) and (max-width:1050px){
-.changeImgBtn {
- position: absolute;
- background: #f0ecec;
- min-height: 25px;
- width: 24px !important;
- height: 20px;
- border-radius: 50%;
- bottom: 55px;
- right: 41%;
- top: -10%;
- z-index: 99;
-}}
-@media screen and (min-width: 1060px) and (max-width:1090px){
+@media screen and (min-width: 1px) and (max-width:766px) {
+ .grid-card {
+ right: 5px;
+ position: relative;
+ display: block;
+ z-index: 5;
+ width: 103%;
+ }
+}
+
+@media screen and (min-width: 1px) and (max-width:766px) {
+ .grid-card-ar {
+ left: 5px;
+ position: relative;
+ display: block;
+ z-index: 5;
+ width: 103%;
+ }
+}
+
+@media screen and (min-width: 768px) and (max-width:1050px) {
+ .grid-card {
+ right: 5px;
+ position: relative;
+ display: block;
+ z-index: 5;
+ width: 101%;
+ }
+}
+
+@media screen and (min-width: 768px) and (max-width:1050px) {
+ .grid-card-ar {
+ left: 5px;
+ position: relative;
+ display: block;
+ z-index: 5;
+ width: 101%;
+ }
+}
+
+@media screen and (min-width: 1px) and (max-width:766px) {
+ .changeImgBtn {
+ position: absolute;
+ background: #f0ecec;
+ min-height: 25px;
+ width: 24px !important;
+ height: 20px;
+ border-radius: 50%;
+ bottom: 55px;
+ right: 36%;
+ top: -15%;
+ z-index: 99;
+ }
+}
+
+@media screen and (min-width: 768px) and (max-width:1050px) {
.changeImgBtn {
position: absolute;
background: #f0ecec;
@@ -1084,9 +1148,25 @@ $actionBtnSize: 36px;
right: 41%;
top: -10%;
z-index: 99;
- }}
+ }
+}
-@media screen and (min-width: 1px) and (max-width:766px){
+@media screen and (min-width: 1060px) and (max-width:1090px) {
+ .changeImgBtn {
+ position: absolute;
+ background: #f0ecec;
+ min-height: 25px;
+ width: 24px !important;
+ height: 20px;
+ border-radius: 50%;
+ bottom: 55px;
+ right: 41%;
+ top: -10%;
+ z-index: 99;
+ }
+}
+
+@media screen and (min-width: 1px) and (max-width:766px) {
.changeImgBtn-ar {
position: absolute;
background: #f0ecec;
@@ -1098,8 +1178,10 @@ $actionBtnSize: 36px;
left: 36%;
top: -15%;
z-index: 99;
- }}
- @media screen and (min-width: 768px) and (max-width:1050px){
+ }
+}
+
+@media screen and (min-width: 768px) and (max-width:1050px) {
.changeImgBtn-ar {
position: absolute;
background: #f0ecec;
@@ -1111,20 +1193,23 @@ $actionBtnSize: 36px;
left: 41%;
top: -10%;
z-index: 99;
- }}
- @media screen and (min-width: 1060px) and (max-width:1090px){
- .changeImgBtn-ar {
- position: absolute;
- background: #f0ecec;
- min-height: 25px;
- width: 24px !important;
- height: 20px;
- border-radius: 50%;
- bottom: 55px;
- left: 46%;
- top: -10%;
- z-index: 99;
- }}
+ }
+}
+
+@media screen and (min-width: 1060px) and (max-width:1090px) {
+ .changeImgBtn-ar {
+ position: absolute;
+ background: #f0ecec;
+ min-height: 25px;
+ width: 24px !important;
+ height: 20px;
+ border-radius: 50%;
+ bottom: 55px;
+ left: 46%;
+ top: -10%;
+ z-index: 99;
+ }
+}
.menubutton {
background: #f0ecec;
@@ -1165,18 +1250,18 @@ $actionBtnSize: 36px;
border: none;
}
-.card-size-info-en{
+.card-size-info-en {
// width: 88%;
// left: 2%;
// width: 89%;
// left: 10px;
- width: 90%;
- left: 5%;
- padding-left: 0px;
- margin-left: 0px;
+ width: 90%;
+ left: 5%;
+ padding-left: 0px;
+ margin-left: 0px;
}
-.card-size-info-ar{
+.card-size-info-ar {
width: 90%;
right: 3%;
padding-right: 0px;
@@ -1203,12 +1288,18 @@ $actionBtnSize: 36px;
// color: #2B353E;
// opacity: 1;
// }
-.update{
- --background: #20A169; background: white; width: 100%;
+.update {
+ --background: #20A169;
+ background: white;
+ width: 100%;
}
-.add{
- --background: #00bcd4; background: white; width: 100%;
+
+.add {
+ --background: #00bcd4;
+ background: white;
+ width: 100%;
}
+
.add-icon-styling {
background-color: #191814;
width: 35px;
@@ -1219,7 +1310,7 @@ $actionBtnSize: 36px;
right: 30px;
}
-.name{
+.name {
text-align: center;
letter-spacing: -0.84px;
color: #2B353E;
@@ -1228,7 +1319,8 @@ $actionBtnSize: 36px;
line-height: 21px;
font-size: 21px;
}
-.email{
+
+.email {
text-align: center;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
font-size: 13px;
@@ -1239,19 +1331,19 @@ $actionBtnSize: 36px;
}
-.subTitle{
+.subTitle {
text-align: center;
letter-spacing: -0.52px;
color: #A2A2A2;
opacity: 1;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
font-size: 13px;
- line-height: 0px;
+ line-height: 0px;
margin-bottom: 7px;
}
-.boldText{
+.boldText {
text-align: center;
letter-spacing: -0.64px;
color: #2B353E;
@@ -1261,15 +1353,15 @@ $actionBtnSize: 36px;
line-height: 19px;
}
-.btnTitle{
+.btnTitle {
text-align: center;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 10px;
- font-size: 11px;
+ font-size: 11px;
color: #4D4D4D;
}
-.Profileheader-label-text-form{
+.Profileheader-label-text-form {
text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 30px;
@@ -1281,8 +1373,8 @@ $actionBtnSize: 36px;
margin-bottom: 2px;
}
-.header-label-text-form{
- text-align: left;
+.header-label-text-form {
+ text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 30px;
font-size: 20px;
@@ -1291,10 +1383,11 @@ $actionBtnSize: 36px;
opacity: 1;
margin-top: -3px;
margin-bottom: 2px;
- margin-left: -11px;}
+ margin-left: -11px;
+}
-.type-label-text-form{
+.type-label-text-form {
text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 20px;
@@ -1304,7 +1397,7 @@ $actionBtnSize: 36px;
opacity: 1;
}
-.result-label-text-form{
+.result-label-text-form {
text-align: left;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 20px;
@@ -1315,7 +1408,7 @@ $actionBtnSize: 36px;
}
-.Profileheader-label-text-form-ar{
+.Profileheader-label-text-form-ar {
text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 30px;
@@ -1327,8 +1420,8 @@ $actionBtnSize: 36px;
margin-bottom: 2px;
}
-.header-label-text-form-ar{
- text-align: right;
+.header-label-text-form-ar {
+ text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 30px;
font-size: 20px;
@@ -1337,10 +1430,11 @@ $actionBtnSize: 36px;
opacity: 1;
margin-top: -3px;
margin-bottom: 2px;
- margin-left: -11px;}
+ margin-left: -11px;
+}
-.type-label-text-form-ar{
+.type-label-text-form-ar {
text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 20px;
@@ -1350,7 +1444,7 @@ $actionBtnSize: 36px;
opacity: 1;
}
-.result-label-text-form-ar{
+.result-label-text-form-ar {
text-align: right;
font-family: var(--fontFamilyPoppins-SemiBold, inherit);
line-height: 20px;
@@ -1359,56 +1453,63 @@ $actionBtnSize: 36px;
color: #2B353E;
opacity: 1;
}
-.create-edit{
+
+.create-edit {
font-size: 20px;
}
-.profile-green{
- background: #20A16A;
- margin-right: 5px;
- width: 80px;
- height: 8px;
+
+.profile-green {
+ background: #20A16A;
+ margin-right: 5px;
+ width: 80px;
+ height: 8px;
border-radius: 5px;
}
-.profile-gray{
- background: #D9D9D9;
- margin-right: 5px;
- width: 80px;
- height: 8px;
+.profile-gray {
+ background: #D9D9D9;
+ margin-right: 5px;
+ width: 80px;
+ height: 8px;
border-radius: 5px;
}
-.family-member-button{
- width: 115px;
- height: 45px;
- background-color: #F5F5F5;
- display: flex;
- align-items: center;
- padding: 16px;
+
+.family-member-button {
+ width: 115px;
+ height: 45px;
+ background-color: #F5F5F5;
+ display: flex;
+ align-items: center;
+ padding: 16px;
border-radius: 20px;
box-shadow: 0px 0px 5px #00000029;
}
-.profile-note-en{
- margin-left: 20px;
- margin-top: 5px;
+
+.profile-note-en {
+ margin-left: 20px;
+ margin-top: 5px;
font-size: 13px;
}
-.profile-note-ar{
- margin-right: 20px;
- margin-top: 5px;
+
+.profile-note-ar {
+ margin-right: 20px;
+ margin-top: 5px;
font-size: 13px;
}
-.profile-compilation-en{
- margin-left: 20px;
- margin-top: 5px;
+.profile-compilation-en {
+ margin-left: 20px;
+ margin-top: 5px;
font-size: 13px;
}
-.profile-compilation-ar{
- margin-left: 20px;
- margin-top: 5px;
+
+.profile-compilation-ar {
+ margin-left: 20px;
+ margin-top: 5px;
font-size: 13px;
}
-.disabledButton{
- opacity:.5;
-pointer-events: none;
-}
+
+.disabledButton {
+ opacity: .5;
+ pointer-events: none;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html
index 04ed513a..203320cc 100644
--- a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html
+++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html
@@ -34,7 +34,7 @@
- {{ts.trPK('general','next')}}
+ {{ts.trPK('general','next')}}
diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts
index 03e9ea84..2badc98d 100644
--- a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts
+++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts
@@ -16,9 +16,9 @@ export class EditDetailProfileComponent implements OnInit {
public ts: TranslatorService,
) { }
- colorRadio = "#269db8"
+ colorRadio = "#BE332F"
- ngOnInit() {
+ ngOnInit() {
console.log(this.sourceName);
}
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
index 090524b4..ae632df7 100644
--- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
+++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
@@ -1,20 +1,18 @@
+.colorBG {
+ --background: #f0efef;
+}
+.header-div {
+ text-transform: capitalize;
+ background: #BE332F;
+ display: block;
+ position: relative;
+ height: 160px;
+ margin-bottom: 60px;
+ padding-top: 10px;
+}
-
-.colorBG{
- --background: #f0efef;
- }
- .header-div{
- text-transform: capitalize;
- background: #269DB8;
- display: block;
- position: relative;
- height: 160px;
- margin-bottom: 60px;
- padding-top: 10px;
- }
-
-.btnBack{
+.btnBack {
background: var(--customnavy);
white-space: normal;
color: var(--light);
@@ -23,11 +21,12 @@
margin-top: -8px !important;
}
-.profilediv{
+.profilediv {
margin-left: 337px;
}
-.profileImg{
+
+.profileImg {
width: 25px;
height: 24px;
/* display: -webkit-inline-box; */
@@ -38,72 +37,74 @@
position: relative;
top: -22px;
// margin-left: 337px;
-
+
}
.proTitles {
- margin: 0;
- padding: 0;
- font-size: 16px;
- text-align: center;
- font-weight: bolder;
- color: white;
- margin-top: -33px;
- }
-
- .grid{
-
- background-color: #f9f9f9;
- margin-top: 9px;
- margin-bottom: 7px !important;
- border-radius: 21px;
- margin-bottom: 26px;
- margin-left: 14px;
- margin-right: 14px;
- padding-bottom: 1px;
- border: solid #d7d4d4 !important;
-
- }
- .Text {
- margin: 0;
- padding: 0;
- text-align: center;
- font-weight: bolder;
- color: black;
- font-size: 16px;
- margin-top: 5px;
- margin-bottom: 10px;
- text-align: center;
- // margin-left: 74px;
- width: 100%;
- }
- .Text-ar{
- margin: 0;
- padding: 0;
- text-align: center;
- font-weight: bolder;
- color: black;
- font-size: 16px;
- margin-top: 5px;
- margin-bottom: 10px;
- text-align: center;
-
- margin-right: 131px;
- }
-
- .leftgrid{
- margin-left: 10px;
- background: white;
- border: solid #d7d4d4;
- margin: 7px;
- border-radius: 24px;
- width: 30% !important;
- padding-bottom: 9px;
- padding-top: 11px;
- padding-left: 10px;
-}
-
-.rightgrid{
+ margin: 0;
+ padding: 0;
+ font-size: 16px;
+ text-align: center;
+ font-weight: bolder;
+ color: white;
+ margin-top: -33px;
+}
+
+.grid {
+
+ background-color: #f9f9f9;
+ margin-top: 9px;
+ margin-bottom: 7px !important;
+ border-radius: 21px;
+ margin-bottom: 26px;
+ margin-left: 14px;
+ margin-right: 14px;
+ padding-bottom: 1px;
+ border: solid #d7d4d4 !important;
+
+}
+
+.Text {
+ margin: 0;
+ padding: 0;
+ text-align: center;
+ font-weight: bolder;
+ color: black;
+ font-size: 16px;
+ margin-top: 5px;
+ margin-bottom: 10px;
+ text-align: center;
+ // margin-left: 74px;
+ width: 100%;
+}
+
+.Text-ar {
+ margin: 0;
+ padding: 0;
+ text-align: center;
+ font-weight: bolder;
+ color: black;
+ font-size: 16px;
+ margin-top: 5px;
+ margin-bottom: 10px;
+ text-align: center;
+
+ margin-right: 131px;
+}
+
+.leftgrid {
+ margin-left: 10px;
+ background: white;
+ border: solid #d7d4d4;
+ margin: 7px;
+ border-radius: 24px;
+ width: 30% !important;
+ padding-bottom: 9px;
+ padding-top: 11px;
+ padding-left: 10px;
+}
+
+.rightgrid {
margin-left: 10px;
background: white;
border: solid #d7d4d4;
@@ -114,10 +115,10 @@
padding-top: 11px;
padding-left: 10px;
margin-right: 189px;
-
+
}
-.performancecolor{
+.performancecolor {
border: solid #bebbbb 1px !important;
border-radius: 13px;
margin-top: 0px !important;
@@ -125,29 +126,31 @@
padding-right: 8px !important;
width: 65px;
margin-bottom: -10px;
-
+
}
-.label{
+.label {
font-size: 13px !important;
margin-top: -7px !important;
font-weight: bold !important;
}
-.label-ar{
- font-size: 15px !important;
- margin-top: -7px !important;
- font-weight: bold !important;
+
+.label-ar {
+ font-size: 15px !important;
+ margin-top: -7px !important;
+ font-weight: bold !important;
}
-.labelvalue{
+.labelvalue {
font-size: 25px !important;
font-weight: bold !important;
margin-top: 7px !important;
margin-left: 90px !important;
}
-.labelvalue-ar{
+
+.labelvalue-ar {
// margin-right: 19px !important;
font-size: 24px !important;
font-weight: bold !important;
@@ -155,29 +158,29 @@
}
-.percentage{
+.percentage {
font-size: 20px !important;
margin-top: 15px !important;
margin-left: -7px;
}
-.percentage-ar{
+
+.percentage-ar {
// margin-right: -54px;
font-size: 19px !important;
- margin-right: -51px;
+ margin-right: -51px;
}
-.gauge{
+.gauge {
// transform: translate(-24px, -65px);
margin-bottom: -140px;
margin-top: -70px;
}
-.gauge-ar{
+
+.gauge-ar {
transform: translate(-24px, -65px);
margin-bottom: -187px;
margin-top: -20px;
margin-right: -56px;
-}
-
-
+}
\ No newline at end of file
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts
index a3a61872..91f49925 100644
--- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts
+++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts
@@ -48,7 +48,7 @@ export class PerformanceEvaluationComponent implements OnInit {
colorScheme = {
- domain: ['#269DB8', '#269DB8', '#3CB9D5', '#1FA269', '#0D155E']
+ domain: ['#BE332F', '#BE332F', '#3CB9D5', '#1FA269', '#0D155E']
};
ngOnInit() {
diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.scss b/Mohem/src/app/profile/profile-image/profile-image.component.scss
index c686e7e3..2ae1509d 100644
--- a/Mohem/src/app/profile/profile-image/profile-image.component.scss
+++ b/Mohem/src/app/profile/profile-image/profile-image.component.scss
@@ -8,23 +8,23 @@
// background: transparent;
// border-radius: 50% !important;
// }
-.header-toolbar-new{
- --background: #269DB8;
- }
+.header-toolbar-new {
+ --background: #BE332F;
+}
-.imgCircle{
-// width: 90px;
-// height: 90px;
-// display: inline-flex;
-// overflow: hidden;
-// background: transparent;
-// -webkit-border-radius:50% !important;
-// -moz-border-radius:50% !important;
-// border-radius: 50% !important;
-// // margin:0 auto 40px;
+.imgCircle {
+ // width: 90px;
+ // height: 90px;
+ // display: inline-flex;
+ // overflow: hidden;
+ // background: transparent;
+ // -webkit-border-radius:50% !important;
+ // -moz-border-radius:50% !important;
+ // border-radius: 50% !important;
+ // // margin:0 auto 40px;
-position: relative;
-width: 234px;
+ position: relative;
+ width: 234px;
height: 215px;
margin-top: 33px !important;
margin: auto;
@@ -33,22 +33,23 @@ width: 234px;
overflow: hidden;
background: transparent;
border-radius: 50% !important;
- color:#fff;
-// background-color: rgba(0,0,0,0.1);
-// box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+ color: #fff;
+ // background-color: rgba(0,0,0,0.1);
+ // box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
- img{
- -webkit-border-radius:50% !important;
- -moz-border-radius:50% !important;
+ img {
+ -webkit-border-radius: 50% !important;
+ -moz-border-radius: 50% !important;
border-radius: 50% !important;
height: auto !important;
width: 70% !important;
}
+
//box-shadow: 0px 0px 0px 10px #8c8c8c;
}
-.header-toolbar-new{
- --background: #269DB8;
- }
\ No newline at end of file
+.header-toolbar-new {
+ --background: #BE332F;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/profile/submit-eit-modal/submit-address-modal.component.scss b/Mohem/src/app/profile/submit-eit-modal/submit-address-modal.component.scss
index 5a81509a..93545e99 100644
--- a/Mohem/src/app/profile/submit-eit-modal/submit-address-modal.component.scss
+++ b/Mohem/src/app/profile/submit-eit-modal/submit-address-modal.component.scss
@@ -1,53 +1,52 @@
-.rowBtn{
+.rowBtn {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
}
-.Header{
+.Header {
color: black !important;
font-size: 25px !important;
- font-weight: bold !important;;
+ font-weight: bold !important;
+ ;
margin: 0;
text-align: center;
margin-bottom: 20px;
}
-.labelRadio{
+.labelRadio {
color: black !important;
font-weight: bold !important;
padding-bottom: 20px;
}
-.labelcheck{
+.labelcheck {
color: red !important;
font-weight: bold !important;
margin-bottom: 10px;
}
-.submitOkButton{
+.submitOkButton {
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
- --background:: #269DB8;
+ --background: #BE332F;
width: 100% !important;
- color: white!important;
+ color: white !important;
border-radius: 16px !important;
}
-.submitCancelButton{
+
+.submitCancelButton {
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
- --background:: #269DB8;
+ --background: #BE332F;
width: 100% !important;
- color: white!important;
+ color: white !important;
border-radius: 16px !important;
-}
-
-
-
+}
\ No newline at end of file
diff --git a/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss b/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss
index 2ed98379..a53d7d25 100644
--- a/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss
+++ b/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss
@@ -1,263 +1,273 @@
.footer-button {
- border-radius: 2px;
- padding: 0 1.1em;
- min-height: 45px;
- min-width: 200px;
- }
-
- .imgSize {
- width: 22px;
- height: 22px;
- }
-
- .Header {
- font-weight: bold;
- color: #1a586d !important;
- font-size: 10px;
- }
-
- .tbData {
- font-size: 10px;
- }
-
- .btnBack {
- background: transparent;
- float: right;
- }
-
- .attachmentDiv{
- background: #ffffff;
- height: auto;
- text-align: center;
- padding-top: 1px;
- margin: 10px;
- border-radius: 15px;
- border: 1px solid grey;
- }
-
- .noDataDiv{
- background: #ffffff;
- height: 11%;
- text-align: center;
- padding-top: 1px;
- border-radius: 10px;
- margin: 10px;
- border-radius: 5px;
- }
- .submitNote{
- background: #ffffff;
- height: 80px;
- padding-top: 1px;
- margin: 10px;
- border-radius: 15px;
- border: 1px solid grey;
- }
-
- .approvalList{
- --background: #f0efef;
- height: auto;
- text-align: center;
- padding-top: 1px;
- border-radius: 10px;
- margin: 10px;
- border-radius: 5px;
- }
-
- /************************New Design**********************************/
- .notification-list{
- background: none;
- background: none;
- border-radius: 32px;
- ion-item{
- // margin-top: 5px;
- // margin-bottom: 5px;
-
- background-color: transparent;
- .item-date{
- width: 100%;
- font-size: 16px;
- font-weight: bold;
-
- text-align: start;
- padding: 0;
- margin: 0;
-
- position: absolute;
- left: 0;
- top: 12%;
- }
- ion-label , [item-end]{
-
- white-space: normal;
- font-size: 14px;
- padding-top: 15%;
- // :root[dir="ltr"]{
- // margin-left: 10px;
- // }
- // :root[dir="rtl"]{
- // margin-right: 10px;
- // }
-
- }
-
+ border-radius: 2px;
+ padding: 0 1.1em;
+ min-height: 45px;
+ min-width: 200px;
+}
+
+.imgSize {
+ width: 22px;
+ height: 22px;
+}
+
+.Header {
+ font-weight: bold;
+ color: #c6903e !important;
+ font-size: 10px;
+}
+
+.tbData {
+ font-size: 10px;
+}
+
+.btnBack {
+ background: transparent;
+ float: right;
+}
+
+.attachmentDiv {
+ background: #ffffff;
+ height: auto;
+ text-align: center;
+ padding-top: 1px;
+ margin: 10px;
+ border-radius: 15px;
+ border: 1px solid grey;
+}
+
+.noDataDiv {
+ background: #ffffff;
+ height: 11%;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+ border-radius: 5px;
+}
+
+.submitNote {
+ background: #ffffff;
+ height: 80px;
+ padding-top: 1px;
+ margin: 10px;
+ border-radius: 15px;
+ border: 1px solid grey;
+}
+
+.approvalList {
+ --background: #f0efef;
+ height: auto;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+ border-radius: 5px;
+}
+
+/************************New Design**********************************/
+.notification-list {
+ background: none;
+ background: none;
+ border-radius: 32px;
+
+ ion-item {
+ // margin-top: 5px;
+ // margin-bottom: 5px;
+
+ background-color: transparent;
+
+ .item-date {
+ width: 100%;
+ font-size: 16px;
+ font-weight: bold;
+
+ text-align: start;
+ padding: 0;
+ margin: 0;
+
+ position: absolute;
+ left: 0;
+ top: 12%;
}
+
+ ion-label,
+ [item-end] {
+
+ white-space: normal;
+ font-size: 14px;
+ padding-top: 15%;
+ // :root[dir="ltr"]{
+ // margin-left: 10px;
+ // }
+ // :root[dir="rtl"]{
+ // margin-right: 10px;
+ // }
+
+ }
+
}
-
-
-
-
-
-
- .timeline {
- position: relative;
- margin: 15px 0 0 0;
- // border-bottom: solid 1px var(--cusgray);
- }
-
- .timeline:before {
-
- content: '';
- position: inherit !important;
- top: 0;
- bottom: 0;
- width: 4px;
- // background: #e4e4e4;
- z-index: 1;
- left: 35px;
- /* margin-left: -10px; */
- /* z-index: 1; */
- }
-
- .timeline .timeline-thumb {
-
- border-radius: 500px;
- width: 70px !important;
- z-index: 2;
- position: absolute;
- left: 0px;
- // :root[dir="ltr"]{
- // left: 37px;
- // }
- // :root[dir="rtl"]{
- // right: 37px;
- // }
- float: right;
- top: 9px;
- }
-
- .timeline .timeline-thumb.timeline-icon {
- height: 70px;
- // text-align: center;
- // color: white;
- // border: 5px solid #CBD0D3;
- // transform: scale(0.2);
- }
-
-
-
- .timeline .timeline-item {
- width: 40px;
-
- }
-
- .timeline .timeline-stats {
- position: relative;
- font-size: 12px;
- color: var(--darkgray);
-
- }
-
- .empImge{
- border-radius: 50%;
- width:100%;
- height: 100%;
- border: #dedede solid 1px;
-
- }
- .empImgeRep {
- border-radius: 50% !important;
- width: 80px;
- height: 80px;
- border: #dedede solid 1px;
- }
-
- .line{
- padding-bottom:87px;
- }
-
- .attachLable{
- position: absolute;
- top: 0px;
- z-index: 0;
- background: #30b8c6;
- color: #fff;
- border-radius: 50%;
- border: 0px;
- width: 24px;
- height: 24px;
- text-align: center;
- font-size: 5px;
- }
-
- .removeLable{
- top: 0px;
- z-index: 0;
- background: #d8252d;
- color: #fff;
- border-radius: 50%;
- border: 0px;
- width: 20px;
- height: 20px;
- text-align: center;
- font-size: 5px;
- }
-
- .note-modal {
- // width: 90%;
- // height: 50%;
- // top: 20%;
- // left: 5%;
- // right: 5%;
- // bottom: 5%;
- background: rgba(0, 0, 0, 0.5) !important;
- padding: 30% 10% !important;
- --height: 12cm !important;
- // --width: 80% !important;
- --border-radius:20px;
-
- }
- .header-toolbar-new{
- --background: #269DB8;
- }
- .title{
- margin-top: -37px;
- margin-left: 85px;
- }
- .title-ar{
- margin-top: -37px;
- margin-right: 101px;
- }
- .confirmEitOkButton{
- white-space: normal !important;
- text-transform: capitalize !important;
- min-height: 45px !important;
- min-width: 5px !important;
- margin: 8px !important;
- background-color: #269DB8;
- width: 80% !important;
- color: white!important;
- border-radius: 16px !important;
- }
-
- .approvalTitle-ar{
- font-weight: bold;
- font-size: 16px;
- text-align: right;
-
- }
- .approvalTitle{
- font-weight: bold;
- font-size: 16px;
- text-align: left;
- }
-
\ No newline at end of file
+}
+
+
+
+
+
+
+.timeline {
+ position: relative;
+ margin: 15px 0 0 0;
+ // border-bottom: solid 1px var(--cusgray);
+}
+
+.timeline:before {
+
+ content: '';
+ position: inherit !important;
+ top: 0;
+ bottom: 0;
+ width: 4px;
+ // background: #e4e4e4;
+ z-index: 1;
+ left: 35px;
+ /* margin-left: -10px; */
+ /* z-index: 1; */
+}
+
+.timeline .timeline-thumb {
+
+ border-radius: 500px;
+ width: 70px !important;
+ z-index: 2;
+ position: absolute;
+ left: 0px;
+ // :root[dir="ltr"]{
+ // left: 37px;
+ // }
+ // :root[dir="rtl"]{
+ // right: 37px;
+ // }
+ float: right;
+ top: 9px;
+}
+
+.timeline .timeline-thumb.timeline-icon {
+ height: 70px;
+ // text-align: center;
+ // color: white;
+ // border: 5px solid #CBD0D3;
+ // transform: scale(0.2);
+}
+
+
+
+.timeline .timeline-item {
+ width: 40px;
+
+}
+
+.timeline .timeline-stats {
+ position: relative;
+ font-size: 12px;
+ color: var(--darkgray);
+
+}
+
+.empImge {
+ border-radius: 50%;
+ width: 100%;
+ height: 100%;
+ border: #dedede solid 1px;
+
+}
+
+.empImgeRep {
+ border-radius: 50% !important;
+ width: 80px;
+ height: 80px;
+ border: #dedede solid 1px;
+}
+
+.line {
+ padding-bottom: 87px;
+}
+
+.attachLable {
+ position: absolute;
+ top: 0px;
+ z-index: 0;
+ background: #30b8c6;
+ color: #fff;
+ border-radius: 50%;
+ border: 0px;
+ width: 24px;
+ height: 24px;
+ text-align: center;
+ font-size: 5px;
+}
+
+.removeLable {
+ top: 0px;
+ z-index: 0;
+ background: #d8252d;
+ color: #fff;
+ border-radius: 50%;
+ border: 0px;
+ width: 20px;
+ height: 20px;
+ text-align: center;
+ font-size: 5px;
+}
+
+.note-modal {
+ // width: 90%;
+ // height: 50%;
+ // top: 20%;
+ // left: 5%;
+ // right: 5%;
+ // bottom: 5%;
+ background: rgba(0, 0, 0, 0.5) !important;
+ padding: 30% 10% !important;
+ --height: 12cm !important;
+ // --width: 80% !important;
+ --border-radius: 20px;
+
+}
+
+.header-toolbar-new {
+ --background: #BE332F;
+}
+
+.title {
+ margin-top: -37px;
+ margin-left: 85px;
+}
+
+.title-ar {
+ margin-top: -37px;
+ margin-right: 101px;
+}
+
+.confirmEitOkButton {
+ white-space: normal !important;
+ text-transform: capitalize !important;
+ min-height: 45px !important;
+ min-width: 5px !important;
+ margin: 8px !important;
+ background-color: #BE332F;
+ width: 80% !important;
+ color: white !important;
+ border-radius: 16px !important;
+}
+
+.approvalTitle-ar {
+ font-weight: bold;
+ font-size: 16px;
+ text-align: right;
+
+}
+
+.approvalTitle {
+ font-weight: bold;
+ font-size: 16px;
+ text-align: left;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss
index 5cd0e320..bee7b60e 100644
--- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss
+++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss
@@ -99,7 +99,7 @@
// color: #606161;
// font-family: WorkSans-Bold;
// }
-
+
// .card-summary-heading-hours-extended-heading{
// color: #D3D3D3;
// font-family: WorkSans-Bold;
@@ -185,7 +185,7 @@
// .header-div {
-// background-color: #269DB8;
+// background-color: #BE332F;
// text-transform: capitalize;
// height: 180px;
// position: relative;
@@ -209,12 +209,12 @@
// --border-color:white!important ;
// width: 85%!important ;
// height: 40px !important ;
-
+
// }
// .navbar{
// font-size: 10px !important;
-// --background: #269DB8 !important;
+// --background: #BE332F !important;
// color: aliceblue !important;
// // margin-top: 10px !important;
@@ -224,20 +224,20 @@
// // margin-left:330px !important;
// margin-top: 0px !important;
// font-size: 35px !important;
-// background: #269DB8;
+// background: #BE332F;
// color: aliceblue;
// margin-left: 0px !important;
// }
// .person{
-
+
// margin-left:100px !important;
// margin-top: 0px !important;
// font-size: 23px !important;
-// background: #269DB8 !important;
+// background: #BE332F !important;
// color: aliceblue !important;
-
+
// }
// .grid{
@@ -264,24 +264,24 @@
// font-size: 12px;
// margin-top: -13px;
// }
-
+
// .green-amount{
// font-size: 17px;
// font-family: WorkSans-Bold;
// margin-top: -3px;
// }
-
+
// .blue-label{
// font-size: 12px;
// margin-top: -13px;
// }
-
+
// .blue-amount{
// font-size: 17px;
// font-family: WorkSans-Bold;
// margin-top: -4px;
// }
-
+
// .today-graph{
// display:block !important;
// height: 150px !important;
@@ -297,7 +297,7 @@
// // border-radius: 20px !important;
// // height: 270px !important;
// // border: 1px solid #d6d4d4 !important;
-
+
// margin-top: 7px !important;
// margin-left: 15px !important;
// margin-right: 15px !important;
@@ -305,7 +305,7 @@
// border-radius: 20px !important;
// height: 321px !important;
// border: 1px solid #d6d4d4 !important;
-
+
// }
// .labelGrid{
// // margin-top: -30px !important;
@@ -374,11 +374,11 @@
// background:var(--primary);
// background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%);
// background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%);
-// background: #269DB8;
+// background: #BE332F;
// // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%);
// color:var(--light);
// text-transform: capitalize;
-
+
// display: block;
// position: relative;
// height: 210px;
@@ -389,13 +389,13 @@
// .request-heading {
// span {
-
+
// // text-align: center;
-
+
// // display: block;
-
+
// // padding-top: 8px;
-
+
// // font-family: workSans-Regular;
// // text-align: center;
// display: block;
@@ -404,81 +404,81 @@
// margin-left: -157px;
// margin-top: -19px;
// padding-bottom: 16px;
-
+
// }
-
+
// }
-
-
-
+
+
+
// .result-graph {
-
+
// position: relative;
-
+
// background: white;
-
+
// margin-right: 20px;
-
+
// margin-left: 20px;
-
+
// margin-top: 20px;
-
+
// padding-bottom: 20px;
-
+
// border-radius: 20px;
-
+
// }
-
-
-
+
+
+
// .result-text-container {
-
+
// padding: 0;
-
+
// margin: 0;
-
+
// position: absolute;
-
+
// left: 38%;
// top: 60%;
-
+
// display: block;
-
+
// text-align: center;
-
+
// transform: translate(-50%, -50%);
-
+
// h2 {
-
+
// font-size: 25px;
-
+
// font-family: WorkSans-Bold;
// color: black !important;
// margin: 0 auto;
-
+
// line-height: 36px;
-
+
// }
// p {
-
+
// font-size: 20px;
// color: black !important;
// // font-family: WorkSans-Bold;
-
+
// margin: 0 auto;
-
+
// line-height: 36px;
-
+
// }
-
+
// span {
-
+
// width: 125px;
-
+
// display: block;
-
+
// margin: 0 auto;
-
+
// font-size: 12px;
// color: black !important;
// font-family: workSans-Regular;
@@ -490,7 +490,8 @@
ion-content {
--ion-background-color: whitesmoke;
}
-ion-title{
+
+ion-title {
color: white;
position: absolute;
top: 0;
@@ -501,109 +502,123 @@ ion-title{
font-weight: bold;
height: 100%;
}
-.contentBg{
+
+.contentBg {
padding: 0px 20px;
}
.contentBg:before {
position: absolute;
-content: "";
-background: #269DB8;
-height: 140px;
-width: 100%;
-left: 0;
-top: 0px;
-z-index: 1;
-}
-
-.user-info{
- text-align: center;
- margin-bottom: 15px;
- .user-image-container{
- position: relative;
- width: 80px;
- height: 80px;
- display: block;
- margin: 0 auto;
- // &:before{
- // position: absolute;
- // content: "";
- // width: 20px;
- // height: 20px;
- // border-radius: 20px;
- // border: 1px solid white;
- // top: 0;
- // right: 0;
- // background-color: red;
- // z-index: 9;
- // }
- // &.present:before{
- // background-color: green !important;
- // }
- }
- .user-image{
- overflow: hidden;
- position: relative;
- display: block;
- width: 100%;
- height: 100%;
- border-radius: 80px;
- border: 1px solid #ccc;
- margin: 0px auto 6px;
- }
- h1{
- margin: 0;
- padding: 0;
- font-family: WorkSans-Bold;
- font-size: 18px;
- margin-bottom: 4px;
- }
- span{
- font-size: 14px;
- display: block;
- color: #888
- }
+ content: "";
+ background: #BE332F;
+ height: 140px;
+ width: 100%;
+ left: 0;
+ top: 0px;
+ z-index: 1;
+}
+
+.user-info {
+ text-align: center;
+ margin-bottom: 15px;
+
+ .user-image-container {
+ position: relative;
+ width: 80px;
+ height: 80px;
+ display: block;
+ margin: 0 auto;
+ // &:before{
+ // position: absolute;
+ // content: "";
+ // width: 20px;
+ // height: 20px;
+ // border-radius: 20px;
+ // border: 1px solid white;
+ // top: 0;
+ // right: 0;
+ // background-color: red;
+ // z-index: 9;
+ // }
+ // &.present:before{
+ // background-color: green !important;
+ // }
+ }
+
+ .user-image {
+ overflow: hidden;
+ position: relative;
+ display: block;
+ width: 100%;
+ height: 100%;
+ border-radius: 80px;
+ border: 1px solid #ccc;
+ margin: 0px auto 6px;
+ }
+
+ h1 {
+ margin: 0;
+ padding: 0;
+ font-family: WorkSans-Bold;
+ font-size: 18px;
+ margin-bottom: 4px;
+ }
+
+ span {
+ font-size: 14px;
+ display: block;
+ color: #888
+ }
}
+
$actionBtnSize : 36px;
-.user-actions{
- text-align: center;
- .action-button{
- font-size: 11px;
- white-space: nowrap;
- color: #888;
- .action-button-icon{
- width: $actionBtnSize;
- height: $actionBtnSize;
- border-radius: $actionBtnSize;
- margin: 0 auto;
- display: block;
- background-color: #269DB8;
- line-height: $actionBtnSize;
- margin-bottom: 3px;
- img{
- margin: 0 auto;
- vertical-align: middle;
- }
- }
+
+.user-actions {
+ text-align: center;
+
+ .action-button {
+ font-size: 11px;
+ white-space: nowrap;
+ color: #888;
+
+ .action-button-icon {
+ width: $actionBtnSize;
+ height: $actionBtnSize;
+ border-radius: $actionBtnSize;
+ margin: 0 auto;
+ display: block;
+ background-color: #BE332F;
+ line-height: $actionBtnSize;
+ margin-bottom: 3px;
+
+ img {
+ margin: 0 auto;
+ vertical-align: middle;
+ }
}
+ }
}
-.employee-information-indetail{
+
+.employee-information-indetail {
background: white;
margin-top: 15px;
border-radius: 20px;
margin-bottom: 15px;
- ion-col{
- padding: 15px;
- border-bottom: 1px solid #ccc;
+
+ ion-col {
+ padding: 15px;
+ border-bottom: 1px solid #ccc;
}
- h2{
- font-size: 13px;
- font-family: WorkSans-Bold;
- margin: 0;
+
+ h2 {
+ font-size: 13px;
+ font-family: WorkSans-Bold;
+ margin: 0;
}
- p{
- font-size: 13px;
- margin: 0;
+
+ p {
+ font-size: 13px;
+ margin: 0;
}
}
@@ -617,27 +632,31 @@ $actionBtnSize : 36px;
.active-Segment {
font-size: 0.3cm !important;
- background: #269DB8 !important;
+ background: #BE332F !important;
text-transform: none;
--color-checked: none;
border-radius: 100px;
- border:0;
+ border: 0;
}
-.active-Segment ion-label{
+
+.active-Segment ion-label {
font-size: 11px;
color: white !important;
}
-.normal-Segment ion-label{
+
+.normal-Segment ion-label {
color: black !important;
font-size: 11px;
}
+
.normal-Segment {
font-size: 0.3cm !important;
text-transform: none;
--color-checked: none;
border: 0;
}
-.colum-container{
+
+.colum-container {
padding: 15px;
border-bottom: 1px solid #ccc;
}
@@ -648,72 +667,80 @@ $actionBtnSize : 36px;
margin-top: 10px;
}
-.search-dropdown{
- background: #269DB8;
+.search-dropdown {
+ background: #BE332F;
+
ion-select {
- .select-text{
- margin-left: -10px;
- }
- .select-icon{
- .select-icon-inner{
- opacity: 1;
- color: white;
- margin-top: -1px;
- }
+ .select-text {
+ margin-left: -10px;
+ }
+
+ .select-icon {
+ .select-icon-inner {
+ opacity: 1;
+ color: white;
+ margin-top: -1px;
}
+ }
}
}
-.input-container{
+.input-container {
background: white;
- ion-input{
- border-bottom-color: transparent;
+
+ ion-input {
+ border-bottom-color: transparent;
}
}
-.search-container{
+.search-container {
margin-top: 15px;
- ion-col{
- background: white;
- border-radius: 12px;
- padding-right: 10px;
- flex: none;
- ion-icon{
- margin-right: 3px;
- font-size: 14px;
- margin-left: 3px;
- vertical-align: middle;
- }
- span{
- font-size: 12px;
- vertical-align: middle;
- }
+
+ ion-col {
+ background: white;
+ border-radius: 12px;
+ padding-right: 10px;
+ flex: none;
+
+ ion-icon {
+ margin-right: 3px;
+ font-size: 14px;
+ margin-left: 3px;
+ vertical-align: middle;
+ }
+
+ span {
+ font-size: 12px;
+ vertical-align: middle;
+ }
}
}
/////////////////////////////////////////////////////// Attendance ///////////////////////
-.header{
+.header {
position: relative;
z-index: 999;
}
-.slidPrev{
+.slidPrev {
margin-left: 10px;
background: transparent;
}
-.slidNext{
+.slidNext {
background: transparent;
margin-top: -1px;
margin-left: 43px;
}
-.activeArrow{
+
+.activeArrow {
height: 20px;
width: 20px;
color: white;
}
-.disabledArrow{
+
+.disabledArrow {
height: 20px;
width: 20px;
color: gray;
@@ -729,14 +756,16 @@ $actionBtnSize : 36px;
z-index: 1;
margin-bottom: 10px;
}
+
.request-heading {
- text-align: left;
- display: block;
- padding-top: 8px;
- margin-bottom: 10px;
- margin-left: 10px;
+ text-align: left;
+ display: block;
+ padding-top: 8px;
+ margin-bottom: 10px;
+ margin-left: 10px;
}
-.request-heading-ar{
+
+.request-heading-ar {
text-align: right;
display: block;
padding-top: 8px;
@@ -753,48 +782,51 @@ $actionBtnSize : 36px;
display: block;
text-align: center;
transform: translate(-50%, -50%);
+
h2 {
- font-size: 38px;
- font-family: WorkSans-Bold;
- margin: 0 auto;
- line-height: 36px;
+ font-size: 38px;
+ font-family: WorkSans-Bold;
+ margin: 0 auto;
+ line-height: 36px;
}
+
span {
- width: 125px;
- display: block;
- margin: 0 auto;
- font-size: 12px;
- font-family: workSans-Regular;
+ width: 125px;
+ display: block;
+ margin: 0 auto;
+ font-size: 12px;
+ font-family: workSans-Regular;
}
}
+
.today-graph {
width: 100%;
max-height: 4cm;
}
-.green-label{
+.green-label {
font-size: 12px;
margin-top: -13px;
}
-
-.green-amount{
+
+.green-amount {
font-size: 17px;
font-family: WorkSans-Bold;
margin-top: -3px;
}
-
-.blue-label{
+
+.blue-label {
font-size: 12px;
margin-top: -13px;
}
-
-.blue-amount{
+
+.blue-amount {
font-size: 17px;
font-family: WorkSans-Bold;
margin-top: -4px;
}
-.labelGrid{
+.labelGrid {
background-color: white !important;
border-radius: 20px !important;
height: 88px !important;
@@ -803,25 +835,26 @@ $actionBtnSize : 36px;
padding: 10px;
label {
- font-size: 9px;
- line-height: 11px !important;
- display: block;
+ font-size: 9px;
+ line-height: 11px !important;
+ display: block;
}
+
h2 {
- font-size: 25px;
- font-weight: bold;
- display: block;
- text-align: right;
- margin:0;
- position: absolute;
- bottom: 0;
- left:0;
- width: 100%;
- padding: 10px;
+ font-size: 25px;
+ font-weight: bold;
+ display: block;
+ text-align: right;
+ margin: 0;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ padding: 10px;
}
}
-.bodyGrid{
+.bodyGrid {
margin-top: 7px !important;
margin-left: 15px !important;
margin-right: 15px !important;
@@ -830,29 +863,33 @@ $actionBtnSize : 36px;
height: 321px !important;
border: 1px solid #d6d4d4 !important;
}
-.attendance-information{
+
+.attendance-information {
background: white;
border-radius: 20px;
padding: 10px;
+
@media screen and (min-width: 300px) and (max-width:359px) {
- h2{
- padding: 0;
- margin: 0;
- font-size: 14px;
- }
- span{
- font-size: 9px;
- }
+ h2 {
+ padding: 0;
+ margin: 0;
+ font-size: 14px;
+ }
+
+ span {
+ font-size: 9px;
+ }
}
@media screen and (min-width: 360px) {
- h2{
+ h2 {
padding: 0;
margin: 0;
font-size: 18px;
}
- span{
- font-size: 9px;
+
+ span {
+ font-size: 9px;
}
}
}
@@ -863,79 +900,84 @@ $actionBtnSize : 36px;
color: #0a5d53;
}
-.green-label-container{
- border-top: 5px solid #269DB8;
+.green-label-container {
+ border-top: 5px solid #BE332F;
padding: 1px 0px;
margin: 15px 0px
}
-.blue-label-container{
+.blue-label-container {
border-top: 5px solid #292F42;
padding: 1px 0px;
margin: 15px 0px
}
-.span-one{
+
+.span-one {
display: block;
font-size: 12px;
color: black;
}
-.span-two{
+
+.span-two {
display: block;
font-size: 22px;
font-family: WorkSans-Bold;
}
-.graph-container{
+
+.graph-container {
margin-left: -50px;
position: relative;
margin-right: 50px;
}
-.label-container{
+
+.label-container {
position: absolute;
width: 20%;
right: 30px;
top: 50%;
margin-top: -60px;
}
+
.attendance-summary .attendance-information {
- span{
- height: 32px;
- display: block;
- line-height: 14px;
+ span {
+ height: 32px;
+ display: block;
+ line-height: 14px;
}
- h2{
- text-align: right;
- font-family: WorkSans-Bold;
+
+ h2 {
+ text-align: right;
+ font-family: WorkSans-Bold;
}
-
+
}
-.calendar-container{
+
+.calendar-container {
background: white;
margin-bottom: 100px;
margin-top: 20px;
border-radius: 20px;
- span{
- text-align: left;
- display: block;
- padding-top: 8px;
- margin-bottom: 10px;
- margin-left: 10px;
+
+ span {
+ text-align: left;
+ display: block;
+ padding-top: 8px;
+ margin-bottom: 10px;
+ margin-left: 10px;
}
}
-.calendar-container-ar{
+
+.calendar-container-ar {
background: white;
margin-bottom: 100px;
margin-top: 20px;
border-radius: 20px;
- span{
+
+ span {
text-align: right;
display: block;
padding-top: 8px;
margin-bottom: 6px;
margin-right: 12px;
}
-}
-
-
-
-
-
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
index 98f15742..4a7ea622 100644
--- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
+++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
@@ -82,7 +82,7 @@ export class TimeCardDetailsComponent implements OnInit {
this.preMonth = new Date().getMonth();
const monthIndex = new Date().getMonth() + 1;
this.currentMonthName = this.direction === 'ltr' ? this.common.getMonthName(monthIndex) : this.common.getMonthNameAr(monthIndex);
- this.calendarConfig(this.common.getMonthName(new Date().getMonth() + 1) , new Date().getFullYear());
+ this.calendarConfig(this.common.getMonthName(new Date().getMonth() + 1), new Date().getFullYear());
}
calendarConfig(month?, year?) {
@@ -102,7 +102,7 @@ export class TimeCardDetailsComponent implements OnInit {
this.selMenu = this.common.sharedService.getSharedData(MenuResponse.SHARED_DATA, false);
this.menuType = this.selMenu.List_Menu.MENU_TYPE;
-
+
dayAndHoursReqObj.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp;
dayAndHoursReqObj.P_MENU_TYPE = this.menuType;
dayAndHoursReqObj.P_SELECTED_RESP_ID = this.respID;
@@ -130,14 +130,14 @@ export class TimeCardDetailsComponent implements OnInit {
allDays[i].customDaysOff = false;
allDays[i].customSchedule = false;
allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE);
- // tslint:disable-next-line: triple-equals
+ // tslint:disable-next-line: triple-equals
} else if (allDays[i].ATTENDED_FLAG == 'N' && allDays[i].ABSENT_FLAG == 'Y') {
allDays[i].customPresent = false;
allDays[i].customAbsent = true;
allDays[i].customDaysOff = false;
allDays[i].customSchedule = false;
allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE);
- // tslint:disable-next-line: triple-equals
+ // tslint:disable-next-line: triple-equals
} else if (allDays[i].ATTENDED_FLAG == 'N' && allDays[i].DAY_TYPE === 'OFF') {
allDays[i].customPresent = false;
allDays[i].customAbsent = false;
@@ -185,7 +185,7 @@ export class TimeCardDetailsComponent implements OnInit {
data: [this.absentDays, this.attendedDays],
backgroundColor: [
'#292F42',
- '#269DB8'
+ '#BE332F'
],
borderWidth: 2
}]
@@ -197,16 +197,16 @@ export class TimeCardDetailsComponent implements OnInit {
nextSlide() {
if (this.currentMonthName !== this.month) {
- this.common.startLoading();
- this.showData = false;
- if (this.nextMonth > 12) {
- this.currentYear = this.currentYear + 1;
- this.nextMonth = 1;
- }
- this.currentDate = new Date(this.currentYear, (this.nextMonth - 1), 1);
- this.calendarConfig(this.common.getMonthName(this.nextMonth) , this.currentYear);
- this.nextMonth = this.nextMonth + 1;
- this.preMonth = this.nextMonth - 2;
+ this.common.startLoading();
+ this.showData = false;
+ if (this.nextMonth > 12) {
+ this.currentYear = this.currentYear + 1;
+ this.nextMonth = 1;
+ }
+ this.currentDate = new Date(this.currentYear, (this.nextMonth - 1), 1);
+ this.calendarConfig(this.common.getMonthName(this.nextMonth), this.currentYear);
+ this.nextMonth = this.nextMonth + 1;
+ this.preMonth = this.nextMonth - 2;
}
}
@@ -214,11 +214,11 @@ export class TimeCardDetailsComponent implements OnInit {
this.common.startLoading();
this.showData = false;
if (this.preMonth === 0) {
- this.currentYear = this.currentYear - 1;
- this.preMonth = 12;
+ this.currentYear = this.currentYear - 1;
+ this.preMonth = 12;
}
this.currentDate = new Date(this.currentYear, (this.preMonth - 1), 1);
- this.calendarConfig(this.common.getMonthName(this.preMonth) , this.currentYear);
+ this.calendarConfig(this.common.getMonthName(this.preMonth), this.currentYear);
this.preMonth = this.preMonth - 1;
this.nextMonth = this.preMonth + 2;
}
diff --git a/Mohem/src/app/vacation-rule/home/home.component.scss b/Mohem/src/app/vacation-rule/home/home.component.scss
index bf5c0751..bbbc0b93 100644
--- a/Mohem/src/app/vacation-rule/home/home.component.scss
+++ b/Mohem/src/app/vacation-rule/home/home.component.scss
@@ -2,13 +2,16 @@
.item-md ios {
white-space: normal;
}
+
.col {
white-space: normal;
font-size: 14px;
}
+
ion-col.colBold {
- color: #1a586d;
+ color: #c6903e;
}
+
.imgSize {
width: 22px;
height: 22px;
@@ -24,7 +27,7 @@ ion-card-header {
}
.header-toolbar {
- --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%);
+ --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #c6903e 100%);
}
.btnBack {
@@ -49,6 +52,7 @@ ion-card-header {
border-top-left-radius: 10px;
border-top-right-radius: 10px;
background: #acacac;
+
.hrTitle {
white-space: normal;
padding: 5px;
@@ -57,6 +61,7 @@ ion-card-header {
min-height: 45px;
line-height: 1.2;
}
+
.button,
.button-md,
button-ios {
@@ -71,62 +76,65 @@ ion-card-header {
}
//////////new design////////////////////////
-.itemVR
-{
- background: #f0efef !important;
- --background: #f0efef !important;
- border: #dbdbdb 1px solid;
- border-radius: 10px;
- margin-bottom: 7px;
-}
-.listVR{
+.itemVR {
+ background: #f0efef !important;
+ --background: #f0efef !important;
+ border: #dbdbdb 1px solid;
+ border-radius: 10px;
+ margin-bottom: 7px;
+}
+
+.listVR {
background: transparent !important;
}
-.red-status{
- color: var(--light) !important;
- font-weight:bold;
- background: var( --red);
- border-radius: 9px;
- text-align: center;
- margin-top: 10px;
- position: relative;
- width: auto;
- height: 100%;
- display: inline-block !important;
- padding: 0px 15px 0px 15px;
-}
-
-.green-status{
- color: var(--light) !important;
- font-weight:bold;
- background: var( --custgreen);
- border-radius: 9px;
- text-align: center;
- margin-top: 10px;
- position: relative;
- width: auto;
- height: 100%;
- display: inline-block !important;
- padding: 0px 15px 0px 15px;
-}
-
-.textBold{
+.red-status {
+ color: var(--light) !important;
+ font-weight: bold;
+ background: var(--red);
+ border-radius: 9px;
+ text-align: center;
+ margin-top: 10px;
+ position: relative;
+ width: auto;
+ height: 100%;
+ display: inline-block !important;
+ padding: 0px 15px 0px 15px;
+}
+
+.green-status {
+ color: var(--light) !important;
+ font-weight: bold;
+ background: var(--custgreen);
+ border-radius: 9px;
+ text-align: center;
+ margin-top: 10px;
+ position: relative;
+ width: auto;
+ height: 100%;
+ display: inline-block !important;
+ padding: 0px 15px 0px 15px;
+}
+
+.textBold {
color: black;
font-weight: bold;
font-size: 17px;
}
-.label{
+
+.label {
margin-top: -19px;
// border-bottom: #eaeaea solid;
padding-bottom: 8px;
color: black !important;
}
-.createdOn{
+
+.createdOn {
margin: -12px 0px -14px 0px;
}
-.optionBtn{
-background: transparent !important;
-}
+
+.optionBtn {
+ background: transparent !important;
+}
\ No newline at end of file
diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss
index 80f3e75f..31e81fb8 100644
--- a/Mohem/src/theme/styles.scss
+++ b/Mohem/src/theme/styles.scss
@@ -40,7 +40,7 @@ button {
}
.header-toolbar {
- --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%);
+ --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #c6903e 100%);
}
ion-label {
@@ -114,7 +114,7 @@ ion-label {
}
.header-toolbar {
- --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%);
+ --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #c6903e 100%);
}
.btnBack {
@@ -1481,7 +1481,7 @@ div.no-dataDiv {
}
.header-toolbar-new {
- --background: #269DB8;
+ --background: #BE332F;
}
@@ -1501,7 +1501,7 @@ div.no-dataDiv {
// margin-left:0;
// }
// .search-dropdown{
-// background: #269DB8;
+// background: #BE332F;
// ion-select {
// .select-text{
// margin-left: -10px;
@@ -1591,7 +1591,7 @@ div.no-dataDiv {
color: #fff !important;
&:before {
- background-color: #269DB8 !important;
+ background-color: #BE332F !important;
}
}
@@ -1655,7 +1655,7 @@ div.no-dataDiv {
// border-radius: 50%;
// }
// .absent::after{
-// background: #269DB8;
+// background: #BE332F;
// }
// .present::after{
@@ -1705,7 +1705,7 @@ table.monthview-datetable th small {
bottom: -8px;
.swiper-pagination-bullet-active {
- background: #269DB8;
+ background: #BE332F;
}
}
@@ -1846,4 +1846,8 @@ ion-app[dir="rtl"] {
.iconBox img {
margin: 5px !important;
}
+
+ .pClass {
+ text-align: right !important;
+ }
}
\ No newline at end of file
diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss
index 9bca9b5c..40ecc2e0 100644
--- a/Mohem/src/theme/variables.scss
+++ b/Mohem/src/theme/variables.scss
@@ -1,43 +1,53 @@
-@font-face {
+@font-face {
font-family: WorkSans-Light;
src: url('../assets/font/WorkSans-Light.otf');
}
+
@font-face {
font-family: GE_SS_TWO_MEDIUM;
src: url('../assets/font/GE_SS_TWO_MEDIUM.otf');
}
+
@font-face {
font-family: WorkSans-Medium;
src: url('../assets/font/WorkSans-Medium.otf');
}
+
@font-face {
font-family: GE_SS_Two_Light;
src: url('../assets/font/GE_SS_Two_Light.otf');
}
+
@font-face {
font-family: WorkSans-Regular;
src: url('../assets/font/WorkSans-Regular.otf');
}
+
@font-face {
font-family: GE_SS_Two_Bold;
src: url('../assets/font/GE_SS_Two_Bold.otf');
}
+
@font-face {
font-family: WorkSans-SemiBold;
src: url('../assets/font/WorkSans-SemiBold.otf');
}
+
@font-face {
font-family: GE_SS_Two_Bold;
src: url('../assets/font/GE_SS_Two_Bold.otf');
}
+
@font-face {
font-family: WorkSans-Bold;
src: url('../assets/font/WorkSans-Bold.otf');
}
+
@font-face {
font-family: Poppins-SemiBold;
src: url('../assets/font/Poppins-SemiBold.ttf');
}
+
@font-face {
font-family: Poppins-Medium;
src: url('../assets/font/Poppins-Medium.ttf');
@@ -47,52 +57,55 @@
font-family: Poppins-Bold;
src: url('../assets/font/Poppins/Poppins-Bold.ttf');
}
+
@font-face {
font-family: Poppins-Medium;
src: url('../assets/font/Poppins/Poppins-Medium.ttf');
}
+
@font-face {
font-family: Poppins;
src: url('../assets/font/Poppins/Poppins-Regular.ttf');
}
+
:root {
---ion-font-family: 'Poppins';
---break-small: 450px;
---break-big:565px;
-//$break-large: 1200px;
---fontFamilyLightEN:'Poppins';
---ontFamilyLightAR:'GE_SS_Two_Light';
---fontFamilyRegularEN:'Poppins';
---fontFamilyRegularAR:'GE_SS_TWO_MEDIUM';
---fontFamilyMediumEN:'Poppins-Regular';
---fontFamilyMediumAR:'GE_SS_TWO_MEDIUM';
---fontFamilyBoldEN:'Poppins-Bold';
---fontFamilyBoldAR:'GE_SS_Two_Bold';
---fontFamilySemiBoldEN:'Poppins-Bold';
---fontFamilySemiBoldAR:'GE_SS_Two_Bold';
---fontFamilyIOSAR:-apple-system, "Helvetica Neue", "Roboto", sans-serif;
---fontFamilyAndroidAR:"Roboto", "Helvetica Neue", sans-serif;
- --primary: #3ac1f1;
- --secondary: #19a163;
- --danger: #f53d3d;
- --customnavy: #1a586d;
- --light: #ffffff;
- --dark: #000000;
- --gray: #e4e5e7;
+ --ion-font-family: 'Poppins';
+ --break-small: 450px;
+ --break-big: 565px;
+ //$break-large: 1200px;
+ --fontFamilyLightEN: 'Poppins';
+ --ontFamilyLightAR: 'GE_SS_Two_Light';
+ --fontFamilyRegularEN: 'Poppins';
+ --fontFamilyRegularAR: 'GE_SS_TWO_MEDIUM';
+ --fontFamilyMediumEN: 'Poppins-Regular';
+ --fontFamilyMediumAR: 'GE_SS_TWO_MEDIUM';
+ --fontFamilyBoldEN: 'Poppins-Bold';
+ --fontFamilyBoldAR: 'GE_SS_Two_Bold';
+ --fontFamilySemiBoldEN: 'Poppins-Bold';
+ --fontFamilySemiBoldAR: 'GE_SS_Two_Bold';
+ --fontFamilyIOSAR: -apple-system, "Helvetica Neue", "Roboto", sans-serif;
+ --fontFamilyAndroidAR: "Roboto", "Helvetica Neue", sans-serif;
+ --primary: #3ac1f1;
+ --secondary: #19a163;
+ --danger: #f53d3d;
+ --customnavy: #c6903e;
+ --light: #ffffff;
+ --dark: #000000;
+ --gray: #e4e5e7;
--custgreen: #209a83;
- --cusgray:#d9d9d9;
- --darkgray:#7F8C8D;
- --grayBG:#acacac;
- --labelColor:#999;
- --orange:#F7941D;
- --green:#209B48;
- --red:#BE1E2D;
- --blue:#223262;
- --cyanblue:#1b75bc;
- --newgreen:#269DB8;
- --darkblue:#269DB8;
- --lightblue:#3cb9d5;
- --newred:#cb3232;
+ --cusgray: #d9d9d9;
+ --darkgray: #7F8C8D;
+ --grayBG: #acacac;
+ --labelColor: #999;
+ --orange: #F7941D;
+ --green: #209B48;
+ --red: #BE1E2D;
+ --blue: #223262;
+ --cyanblue: #1b75bc;
+ --newgreen: #BE332F;
+ --darkblue: #BE332F;
+ --lightblue: #3cb9d5;
+ --newred: #cb3232;
--fontFamilyPoppins-SemiBold: 'Poppins-SemiBold';
--fontFamilyPoppins-Medium: 'Poppins-Medium';
// $font-family-base: $fontFamilyMediumEN !default;
@@ -104,7 +117,7 @@
// font-size: 1.4rem;
// background-color: #fff;
// }
-
+
// ion-app.md {
// font-family: "Roboto", "Helvetica Neue", sans-serif;
// font-size: 1.4rem;
@@ -113,43 +126,43 @@
// $text-input-md-highlight-color:--primary;
// $text-input-ios-highlight-color:--primary;
-
+
// $label-md-text-color-focused:--primary;
// $label-ios-text-color-focused:--primary;
-
+
// $alert-md-button-text-color:--primary;
// $alert-ios-button-text-color:--primary;
-
+
// $alert-md-input-border-color-focused:--primary;
// $alert-ios-checkbox-background-color-on:--primary;
// $alert-ios-checkbox-border-color-on:--primary;
-
+
// $checkbox-md-icon-background-color-on:$primary;
// $checkbox-ios-background-color-on:$primary;
// $checkbox-md-icon-border-color-on:$primary;
-
+
// $toggle-ios-background-color-on:$primary;
// $toggle-md-active-color:$primary;
-
+
// $radio-md-color-on:$primary;
// $radio-ios-color-on:$primary;
-
+
// $button-ios-background-color:$primary;
-
+
// $picker-md-button-text-color:$primary;
// $picker-md-option-selected-color:$primary;
// $picker-ios-button-text-color:$primary;
-
+
// $range-md-bar-active-background-color:$primary;
// $range-ios-bar-active-background-color:$primary;
// $text-input-ios-highlight-color:$primary;
-
-
+
+
// $loading-md-spinner-color:$primary;
-
-
+
+
// $text-input-highlight-color-invalid:$danger;
// $text-input-ios-highlight-color-invalid:$danger;
// $text-input-md-highlight-color-invalid:$danger;
// $text-input-ios-show-focus-highlight: true;
- }
\ No newline at end of file
+}
\ No newline at end of file