fixed merge issues

SRCA_DEV_NEW
umasoodch 3 years ago
parent 3f8c8a7a07
commit dd95c5feb3

@ -227,7 +227,7 @@ ion-card-content.confirm-details {
position: absolute;
top: 0px;
z-index: 0;
background: #44A7A1;
background: #c6903e;
color: #fff;
border-radius: 50%;
border: 0px;

@ -2,11 +2,11 @@
<ion-split-pane>
<ion-menu [swipeGesture]="false" side='start' *ngIf="direction ==='ltr'">
<ion-content class="sidebar-menu">
<div class="header-div" style="visibility: hidden;">
<!-- <div>
<div class="header-div">
<div>
<img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important;" src="../assets/imgs/close_menu_icon.png ">
</div> -->
</div>
<div >
<img class="mohemmLogo" src="../assets/imgs/menu_mohemm_logo.png" >
</div>
@ -21,15 +21,15 @@
</div>
</div>
<div class="border" >
<div style="border-bottom: rgb(190, 187, 187) solid 1px;" >
<button class="logout" ion-button (click)="logout();" > {{ts.trPK('home','logout')}}</button>
</div>
<br>
<ion-list class="list-en" >
<ion-item (click)="profile()" lines="none">
<ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 18px !important; width:16px" src="../assets/imgs/profile_icon.png" item-left>
<img style= "height: 24px !important;" src="../assets/imgs/profile_icon.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','title')}}
@ -43,7 +43,7 @@
{{ts.trPK('userProfile','performance-evaluation')}}
</ion-label>
</ion-item> -->
<ion-item lines="none" [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
</ion-thumbnail>
@ -113,38 +113,22 @@
</ion-list>
<!-- <div class="" style="text-align:center">
<img src="../assets/icon/new-design/moe-logo.png" class="CompanyImg logoImg">
</div> -->
</ion-content>
<ion-footer style="padding: 0px;">
<ion-row>
<div class="footer-container">
<ion-col class="colPad" size="9" style="visibility: hidden">
<img class="logoFotor" src="../assets/imgs/menu_mohemm_logo.png" />
</ion-col>
<ion-col class="colPad" size="3">
<img class="moe-logo" src="../assets/icon/moe-logo.png" />
</ion-col>
</div>
</ion-row>
<div class="" style="text-align:center">
<img src="{{companyUrl}}" class="CompanyImg logoImg">
</div>
<div class="menuFooter" >
<div> <img src="../assets/imgs/CSLogo.png" class="CompanyImg" ></div>
<p class="companyTxt">{{companyDesc}}</p>
</div>
</ion-footer>
</ion-content>
</ion-menu>
<ion-menu [swipeGesture]="false" side='end' *ngIf="direction ==='rtl'">
<ion-content class="sidebar-menu">
<div class="header-div" style="visibility: hidden;">
<!-- <div>
<div class="header-div">
<div>
<img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important; margin-right: 15px;" src="../assets/imgs/close_menu_icon.png ">
</div> -->
</div>
<div>
<img class="mohemmLogo-ar" src="../assets/imgs/menu_mohemm_logo.png" >
</div>
@ -158,15 +142,15 @@
</div>
</div>
<div class="border" >
<div style="border-bottom: rgb(190, 187, 187) solid 1px;" >
<button class="logout-ar" ion-button (click)="logout();" > {{ts.trPK('home','logout')}}</button>
</div>
<br>
<ion-list class="list-ar" >
<ion-item (click)="profile()" lines="none">
<ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 18px !important; width:16px" src="../assets/imgs/profile_icon.png" item-left>
<img style= "height: 24px !important;" src="../assets/imgs/profile_icon.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','title')}}
@ -180,7 +164,7 @@
{{ts.trPK('userProfile','performance-evaluation')}}
</ion-label>
</ion-item> -->
<ion-item lines="none" [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
</ion-thumbnail>
@ -272,31 +256,14 @@
</ion-item> -->
</ion-list>
<!-- <div class="" style="text-align:center"> -->
<!-- <img src="{{companyUrl}}" class="CompanyImg" [ngClass]="TeamFlag!='true'? 'logoImg':'logoImgWithMyTeam'"> -->
<!-- <img src="../assets/icon/new-design/moe-logo.png" class="CompanyImg" [ngClass]="TeamFlag!='true'? 'logoImg':'logoImgWithMyTeam'"> -->
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
<!-- </div> -->
</ion-content>
<ion-footer style="padding: 0px;" dir="ltr">
<ion-row>
<div class="footer-container">
<ion-col class="colPad" size="9" style="visibility: hidden">
<img class="logoFotor" src="../assets/imgs/menu_mohemm_logo.png" />
</ion-col>
<ion-col class="colPad" size="3">
<img class="moe-logo" src="../assets/icon/moe-logo.png" />
</ion-col>
</div>
</ion-row>
<div class="menuFooter" >
<div class="" style="text-align:center">
<img src="{{companyUrl}}" class="CompanyImg" [ngClass]="TeamFlag!='true'? 'logoImg':'logoImgWithMyTeam'">
</div>
<div class="menuFooter">
<div> <img src="../assets/imgs/CSLogo.png" class="CompanyImg" ></div>
<p class="companyTxt">{{companyDesc}}</p>
</div>
</ion-footer>
</ion-content>
</ion-menu>
<ion-router-outlet main></ion-router-outlet>
</ion-split-pane>

@ -10,21 +10,21 @@ header
}
.mohemmLogo {
max-width: 46% !important;
border: 0 !important;
margin-right: 70px !important;
margin-left: 70px !important;
margin-top: -24px !important;
margin-bottom: 5px;
margin: auto;
display: block;
margin-bottom: 11px;
}
.mohemmLogo-ar {
max-width: 46% !important;
border: 0 !important;
margin-right: 70px !important;
margin-top: -24px !important;
margin-bottom: 5px;
margin-bottom: 11px;
}
.closeIcon {
@ -38,10 +38,6 @@ header
top: 10px;
}
hr {
border-width: 1px;
}
.menubutton {
white-space: normal;
@ -83,25 +79,26 @@ hr {
.logout {
background-color: #c6903e;
border: none;
color: black;
color: white;
// padding: 20px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 12px;
margin-left: 120px !important;
margin-top: 15px !important;
margin-bottom: 20px !important;
border-radius: 30px;
height: 35px;
margin: auto;
padding: 0px 24px;
display: block;
// width: 40px;
height: 26px;
padding: 6px 24px;
}
.logout-ar {
background-color: #c6903e;
border: none;
color: black;
color: white;
text-align: center;
text-decoration: none;
display: inline-block;
@ -110,8 +107,8 @@ hr {
margin-top: 15px !important;
margin-bottom: 20px !important;
border-radius: 30px;
height: 35px;
padding: 0px 24px;
height: 26px;
padding: 6px 24px;
}
.menuImg {
@ -292,27 +289,22 @@ button.menu-item.item.item-block.item-ios {
}
.TxtPlace {
font-size: 20px;
margin: 0;
padding: 0;
text-align: center;
font-weight: bolder;
color: black;
font-weight: bold;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
width: 90%;
margin: 10px auto auto auto;
font-size: 16px;
}
.TxtPlaces {
margin: 0;
padding: 0;
text-align: center;
font-weight: bolder;
font-size: 14px;
color: black;
font-weight: bold;
// font-family: 'Inter' !important;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
width: 90%;
margin: 5px auto;
color: darkgray;
}
.menuFooter {
@ -322,7 +314,6 @@ button.menu-item.item.item-block.item-ios {
margin: auto;
width: 100%;
position: absolute;
top: 40px
}
@ -332,30 +323,41 @@ button.menu-item.item.item-block.item-ios {
margin: auto;
}
// .menuFooter .CompanyImg {
// width: 100%;
// height: 100%;
// }
.menuFooter .CompanyImg {
width: 65%;
height: 60%;
width: 80%;
height: 80%;
margin-bottom: -21px;
}
.logoImgWithMyTeam {
// .logoImg{
// width: 120px;
// position: relative;
// }
width: 200px;
margin: 20px auto;
.logoImgWithMyTeam {
width: 77px;
// position: relative;
margin-top: -1px;
margin-bottom: 70px;
}
.logoImg {
width: 250px;
margin-top: 20px;
margin-bottom: 180px;
width: 225px;
}
.companyTxt {
font-size: 12px;
color: black;
color: var(--customnavy);
text-align: center;
font-family: 'Inter' !important;
}
ion-thumbnail.menu-thumb {
@ -371,7 +373,7 @@ ion-thumbnail.menu-thumb {
}
.profile {
color: #5C6F79 !important;
color: black !important;
font-weight: bolder !important;
}
@ -394,8 +396,8 @@ ion-thumbnail.menu-thumb {
// }
.profileImg {
width: 100px;
height: 100px;
width: 140px;
height: 140px;
display: -webkit-inline-box;
display: inline-flex;
overflow: hidden;
@ -403,32 +405,4 @@ ion-thumbnail.menu-thumb {
border-radius: 70% !important;
position: relative;
top: 3px;
}
ion-item,
.border {
border-bottom: #c7c7c7 solid 1px
}
.footer-container {
width: 100%;
display: -webkit-box;
display: flex;
-webkit-box-align: stretch;
align-items: stretch;
}
.footer-container .logoFotor {
margin: 20px;
float: left;
width: 100px !important;
height: 30px !important;
}
.footer-container .moe-logo {
width: 45px;
float: right;
margin-right: 16px;
margin-top: 15px;
}

@ -205,10 +205,10 @@ export class AppComponent implements OnInit {
this.user_image = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : '../assets/imgs/profile.png';
}
// this.User_Job_name = user.JOB_NAME;
let jobTitle = user.POSITION_NAME;
// if (jobTitle && jobTitle.length > 1) {
this.User_Job_name = jobTitle;
// }
let jobTitle = user.POSITION_NAME.split('.');
if (jobTitle && jobTitle.length > 1) {
this.User_Job_name = jobTitle[0] + " " + jobTitle[1];
}
//erm channel
// if (!CommonService.SKIP)
// this.cs.navigateForward('/erm-channel/survey');

@ -15,7 +15,7 @@
<ion-grid>
<ion-row class="ion-justify-content-center">
<ion-col [size]="11" [sizeLg]="8" [sizeXl]="6" no-padding>
<ion-button style="font-size: 16px !important; width:100%; --background: #44a7a1; background: white;" expand="block"
<ion-button style="font-size: 16px !important; width:100%; --background: #c6903e; background: white;" expand="block"
(click)='dismiss()'>
{{ 'general,update-now' | translate }}
</ion-button>

@ -1,7 +1,6 @@
<app-generic-header
*ngIf="!accessFromOutSide"
showBack="true"
[moeImage]="false"
[headerText]="'login,verify-login' | translate">
</app-generic-header>

@ -64,20 +64,10 @@
</div>
</ion-content>
<ion-footer *ngIf="!user" [ngStyle]="keyboardOpened === true ? {'display': 'none'} : {}" style="padding: 0px;" dir="ltr">
<ion-footer *ngIf="!user" [ngStyle]="keyboardOpened === true ? {'display': 'none'} : {}" style="padding: 0px;">
<ion-row>
<div class="footer-container">
<ion-col class="colPad" size="9" style="visibility: hidden">
<img class="logoFotor" src="../assets/imgs/menu_mohemm_logo.png" />
<ion-col class="colPad">
<img class="centerDiv logoFotor" src="../assets/imgs/CSLogo.png" />
</ion-col>
<ion-col class="colPad" size="3">
<img class="moe-logo" src="../assets/icon/moe-logo.png" />
</ion-col>
</div>
</ion-row>
<div class="menuFooter" >
<p class="companyTxt">{{companyDesc}}</p>
</div>
</ion-footer>

@ -202,11 +202,10 @@ img.centerDiv {
margin: -147px 0px 0px 274px;
}
// .logoFotor {
// width: 45px !important;
// height: 45px !important;
// }
.logoFotor {
width: 45px !important;
height: 45px !important;
}
.welcomeText {
justify-content: center;

@ -5,7 +5,6 @@
<app-generic-header
showBack="true"
[moeImage]="false"
[headerText]="'verificationcode,verificationcode' | translate">
</app-generic-header>

@ -12,11 +12,6 @@
<img [src]="userImage"/>
</div>
</ion-col>
<ion-col *ngIf="!showImage && moeImage" [size]="2" style="padding: 0;">
<div class="profile-image-container">
<img src="../assets/icon/moe-logo.png"/>
</div>
</ion-col>
<!-- *ngIf="getPassdirfromNotifiPage == true" -->
<ion-col *ngIf="updateDirection" [size]="2" style="padding: 0;" (click)="closeModal()">

@ -13,7 +13,6 @@ import { TranslatorService } from '../../services/translator/translator.service'
styleUrls: ['./generic-header.component.scss'],
})
export class GenericHeaderComponent implements OnInit {
@Input() moeImage = true;
@Input() userImage = '';
@Input() showImage = false;
@Input() showMenu = false;

@ -32,7 +32,7 @@
.pClass {
font-size: 8px;
font-size: 10px;
text-align: center;
margin-top: 10px;
color: black;

@ -33,7 +33,7 @@
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
background-color: #44A7A1;
background-color: #c6903e;
width: 80% !important;
color: white!important;
border-radius: 16px !important;

@ -193,7 +193,7 @@
position: absolute;
top: 0px;
z-index: 0;
background: #44A7A1;
background: #c6903e;
color: #fff;
border-radius: 50%;
border: 0px;
@ -247,7 +247,7 @@
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
background-color: #44A7A1;
background-color: #c6903e;
width: 80% !important;
color: white!important;
border-radius: 16px !important;

@ -193,7 +193,7 @@
position: absolute;
top: 0px;
z-index: 0;
background: #44A7A1;
background: #c6903e;
color: #fff;
border-radius: 50%;
border: 0px;
@ -247,7 +247,7 @@
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
background-color: #44A7A1;
background-color: #c6903e;
width: 80% !important;
color: white!important;
border-radius: 16px !important;

@ -193,7 +193,7 @@
position: absolute;
top: 0px;
z-index: 0;
background: #44A7A1;
background: #c6903e;
color: #fff;
border-radius: 50%;
border: 0px;

@ -59,7 +59,7 @@
</div>
</ion-col>
<!-- (click)="selectedSegment('family')" -->
<ion-col [size]="3" (click)="selectedSegment('family')">
<ion-col [size]="3" (click)="selectedSegment('family')" class="disabledButton">
<div class="action-button col-button">
<img *ngIf="!familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family.svg">
<img *ngIf="familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family-g.svg">
@ -70,7 +70,7 @@
</div>
<ion-grid [ngClass]="direction === 'ltr'? 'grid-card':'grid-card-ar' ">
<div [ngClass]=" direction == 'ltr' ? 'gridService-en' : 'gridService-ar'"
style="background: #44A7A1; border-radius: 0px 0px 10px 10px;">
style="background: #c6903e; border-radius: 0px 0px 10px 10px;">
<ion-row>
<ion-col>
<label

@ -25,7 +25,7 @@
<div *ngIf="performanceData">
<ion-row >
<ion-col *ngFor="let data of performanceData ;let i = index" [ngClass]="length % 2 != 0 && i == length - 1 ? 'rightgrid' : 'leftgrid'" >
<div class="performancecolor" style="background: #44a7a1;"></div>
<div class="performancecolor" style="background: #c6903e;"></div>
<br>
<label [ngClass]=" direction == 'ltr' ? 'label' : 'label-ar'"> {{ts.trPK('userProfile','your-performance')}} </label>
<label [ngClass]=" direction == 'ltr' ? 'label' : 'label-ar'"> {{data.name}} </label>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 187 KiB

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 759 B

@ -1,6 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
<g id="Group_7231" data-name="Group 7231" transform="translate(-111.351 -245.557)">
<circle id="Ellipse_152" data-name="Ellipse 152" cx="15" cy="15" r="15" transform="translate(111.351 245.557)" fill="#44a7a1"/>
<circle id="Ellipse_152" data-name="Ellipse 152" cx="15" cy="15" r="15" transform="translate(111.351 245.557)" fill="#c6903e"/>
<path id="Path_13" data-name="Path 13" d="M11.706,9.111c-.791-.676-1.593-1.086-2.375-.411l-.466.408c-.341.3-.976,1.681-3.429-1.141S4.443,4.71,4.785,4.416l.469-.409c.777-.677.484-1.529-.077-2.406L4.839,1.07C4.276.2,3.663-.38,2.884.3L2.463.664A3.952,3.952,0,0,0,.922,3.279C.641,5.138,1.528,7.266,3.559,9.6s4.014,3.51,5.9,3.489a3.962,3.962,0,0,0,2.8-1.161l.422-.368c.777-.675.294-1.363-.5-2.041Z" transform="translate(119.204 254.187)" fill="#fff"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 767 B

After

Width:  |  Height:  |  Size: 767 B

@ -1,6 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
<g id="Group_7733" data-name="Group 7733" transform="translate(-111 -245.557)">
<circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#BE332F"/>
<g id="Group_7731" data-name="Group 7731" transform="translate(-111 -245.557)">
<circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#c6903e"/>
<g id="_57-Resume" data-name="57-Resume" transform="translate(117.088 252.214)">
<path id="Path_4729" data-name="Path 4729" d="M18.773,8.481a2.431,2.431,0,0,1-2.431-2.431V2H7.431A2.431,2.431,0,0,0,5,4.431V22.254a2.431,2.431,0,0,0,2.431,2.431H20.393a2.431,2.431,0,0,0,2.431-2.431V8.481ZM11.481,6.051A2.431,2.431,0,1,1,9.051,8.481a2.431,2.431,0,0,1,2.431-2.431Zm-3.241,8.1a2.431,2.431,0,0,1,2.431-2.431h1.62a2.431,2.431,0,0,1,2.431,2.431v1.62a.81.81,0,0,1-.81.81H9.051a.81.81,0,0,1-.81-.81Zm10.532,6.481H9.051a.81.81,0,0,1,0-1.62h9.722a.81.81,0,0,1,0,1.62Zm0-4.051h-1.62a.81.81,0,0,1,0-1.62h1.62a.81.81,0,0,1,0,1.62Zm0-4.051h-1.62a.81.81,0,0,1,0-1.62h1.62a.81.81,0,0,1,0,1.62Z" fill="#fff"/>
<path id="Path_4730" data-name="Path 4730" d="M21.81,6.971h3.581L21,2.58V6.161A.81.81,0,0,0,21.81,6.971Z" transform="translate(-3.037 -0.11)" fill="#fff"/>

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

@ -1,6 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="39" height="39" viewBox="0 0 39 39">
<g id="Group_7680" data-name="Group 7680" transform="translate(-111 -245.557)">
<circle id="Ellipse_152" data-name="Ellipse 152" cx="19.5" cy="19.5" r="19.5" transform="translate(111 245.557)" fill="#BE332F"/>
<path id="family_3_" data-name="family (3)" d="M9.537,15.144v.993A3.01,3.01,0,0,1,6.53,19.144H2.647A.344.344,0,0,1,2.3,18.8V16.984A2.186,2.186,0,0,1,4.487,14.8H9.193a.344.344,0,0,1,.344.344ZM6.53,19.831c-2.567,0-3.49.008-3.871,0a.343.343,0,0,0-.355.343v.637a2.977,2.977,0,1,0,5.953-.024v-.852a.343.343,0,0,0-.458-.324,3.674,3.674,0,0,1-1.269.22Zm4.753,11.8a3.875,3.875,0,0,1-1.948.006.172.172,0,0,0-.177.274,1.486,1.486,0,0,0,2.3-.007.171.171,0,0,0-.175-.271Zm1.506-.259h-.071a.339.339,0,0,0-.321.237,2.184,2.184,0,0,1-3.968.451,2.276,2.276,0,0,1-.208-.449.344.344,0,0,0-.325-.238h-.09a2.062,2.062,0,0,0-2.062,2.062v.344a.344.344,0,0,0,.344.344h8.42a.344.344,0,0,0,.344-.344v-.344a2.062,2.062,0,0,0-2.063-2.061ZM2.307,30.112H.344A.344.344,0,0,0,0,30.455v3.324a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344V30.455a.344.344,0,0,0-.344-.343Zm5.736-5.361a.344.344,0,0,0-.181-.625h-.1a.284.284,0,0,0-.266.184,2.33,2.33,0,0,1-2.142,1.547,2.362,2.362,0,0,1-2.182-1.591.208.208,0,0,0-.2-.14A2.976,2.976,0,0,0,0,27.1v1.98a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344v-.144a.351.351,0,0,1,.321-.354.344.344,0,0,1,.366.343v4.854a.344.344,0,0,0,.344.344H4.713a.343.343,0,0,0,.344-.35v-.338a2.754,2.754,0,0,1,2-2.644.344.344,0,0,0,.178-.543,3.873,3.873,0,0,1,.813-5.5Zm9.574-.626a.279.279,0,0,0-.265.193,2.209,2.209,0,0,1-2.046,1.526,2.305,2.305,0,0,1-2.07-1.545.277.277,0,0,0-.258-.174h-.239a.344.344,0,0,0-.186.625,3.873,3.873,0,0,1,.81,5.5.344.344,0,0,0,.177.543,2.754,2.754,0,0,1,2,2.645c0,.143,0,.249,0,.338a.343.343,0,0,0,.344.35h1.031a.344.344,0,0,0,.344-.344V28.925a.344.344,0,0,1,.366-.343.351.351,0,0,1,.321.354v.144a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V27.1a2.976,2.976,0,0,0-2.98-2.976Zm.326,6.331V33.78a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V30.455a.344.344,0,0,0-.344-.344H18.287a.344.344,0,0,0-.343.344ZM15.374,14.82a4.284,4.284,0,0,0-4.322,4.28v4.26a.344.344,0,0,0,.469.32,3.654,3.654,0,0,1,.567-.166.345.345,0,0,0,.207-.544,3.711,3.711,0,0,1-.722-2.2V19.442a1.031,1.031,0,0,1,1.043-1.031,12.582,12.582,0,0,0,4.157-.649,1.618,1.618,0,0,1,2.133,1.532v1.5a3.678,3.678,0,0,1-.721,2.183.343.343,0,0,0,.2.542,3.63,3.63,0,0,1,.737.242.344.344,0,0,0,.488-.312v-4.3a4.315,4.315,0,0,0-4.237-4.334ZM10.3,24.72A3.179,3.179,0,1,0,13.477,27.9,3.179,3.179,0,0,0,10.3,24.72Zm4.123-.347a.172.172,0,0,0-.164.285,1.382,1.382,0,0,0,2.176-.062.172.172,0,0,0-.182-.274,3.688,3.688,0,0,1-1.83.046Zm2.572-5.954a13.252,13.252,0,0,1-4.385.684.343.343,0,0,0-.348.344v1.326a2.98,2.98,0,1,0,5.959.024V19.3a.93.93,0,0,0-1.226-.883ZM4.35,24.35a.172.172,0,0,0-.171.282,1.545,1.545,0,0,0,2.381-.053.172.172,0,0,0-.182-.275,3.669,3.669,0,0,1-2.028.046Z" transform="translate(120.203 239.361)" fill="#fff"/>
<circle id="Ellipse_152" data-name="Ellipse 152" cx="19.5" cy="19.5" r="19.5" transform="translate(111 245.557)" fill="#259cb8"/>
<path id="family_3_" data-name="family (3)" d="M9.537,15.144v.993A3.01,3.01,0,0,1,6.53,19.144H2.647A.344.344,0,0,1,2.3,18.8V16.984A2.186,2.186,0,0,1,4.487,14.8H9.193A.344.344,0,0,1,9.537,15.144ZM6.53,19.831c-2.567,0-3.49.008-3.871,0a.343.343,0,0,0-.355.343v.637a2.977,2.977,0,1,0,5.953-.024v-.852a.343.343,0,0,0-.458-.324A3.674,3.674,0,0,1,6.53,19.831Zm4.753,11.8a3.875,3.875,0,0,1-1.948.006.172.172,0,0,0-.177.274,1.486,1.486,0,0,0,2.3-.007A.171.171,0,0,0,11.283,31.633Zm1.506-.259h-.071a.339.339,0,0,0-.321.237,2.184,2.184,0,0,1-3.968.451,2.276,2.276,0,0,1-.208-.449.344.344,0,0,0-.325-.238H7.806a2.062,2.062,0,0,0-2.062,2.062v.344a.344.344,0,0,0,.344.344h8.42a.344.344,0,0,0,.344-.344v-.344A2.062,2.062,0,0,0,12.789,31.374ZM2.307,30.112H.344A.344.344,0,0,0,0,30.455v3.324a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344V30.455A.344.344,0,0,0,2.307,30.112Zm5.736-5.361a.344.344,0,0,0-.181-.625l-.1,0a.284.284,0,0,0-.266.184,2.33,2.33,0,0,1-2.142,1.547,2.362,2.362,0,0,1-2.182-1.591.208.208,0,0,0-.2-.14A2.976,2.976,0,0,0,0,27.1v1.98a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344v-.144a.351.351,0,0,1,.321-.354.344.344,0,0,1,.366.343v4.854a.344.344,0,0,0,.344.344H4.713a.343.343,0,0,0,.344-.35c0-.089,0-.195,0-.338a2.754,2.754,0,0,1,2-2.644.344.344,0,0,0,.178-.543,3.873,3.873,0,0,1,.813-5.5Zm9.574-.626a.279.279,0,0,0-.265.193,2.209,2.209,0,0,1-2.046,1.526,2.305,2.305,0,0,1-2.07-1.545.277.277,0,0,0-.258-.174c-.077,0-.156,0-.239,0a.344.344,0,0,0-.186.625,3.873,3.873,0,0,1,.81,5.5.344.344,0,0,0,.177.543,2.754,2.754,0,0,1,2,2.645c0,.143,0,.249,0,.338a.343.343,0,0,0,.344.35h1.031a.344.344,0,0,0,.344-.344V28.925a.344.344,0,0,1,.366-.343.351.351,0,0,1,.321.354v.144a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V27.1A2.976,2.976,0,0,0,17.618,24.124Zm.326,6.331v3.324a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V30.455a.344.344,0,0,0-.344-.344H18.287A.344.344,0,0,0,17.944,30.455ZM15.374,14.82A4.284,4.284,0,0,0,11.052,19.1V23.36a.344.344,0,0,0,.469.32,3.654,3.654,0,0,1,.567-.166.345.345,0,0,0,.207-.544,3.711,3.711,0,0,1-.722-2.2V19.442a1.031,1.031,0,0,1,1.043-1.031,12.582,12.582,0,0,0,4.157-.649,1.618,1.618,0,0,1,2.133,1.532v1.5a3.678,3.678,0,0,1-.721,2.183.343.343,0,0,0,.2.542,3.63,3.63,0,0,1,.737.242.344.344,0,0,0,.488-.312v-4.3a4.315,4.315,0,0,0-4.237-4.334Zm-5.076,9.9a3.179,3.179,0,1,0,3.179,3.179A3.183,3.183,0,0,0,10.3,24.715Zm4.123-.347a.172.172,0,0,0-.164.285,1.382,1.382,0,0,0,2.176-.062.172.172,0,0,0-.182-.274A3.688,3.688,0,0,1,14.421,24.368Zm2.572-5.954a13.252,13.252,0,0,1-4.385.684.343.343,0,0,0-.348.344v1.326a2.98,2.98,0,1,0,5.959.024v-1.5A.93.93,0,0,0,16.993,18.414ZM4.35,24.35a.172.172,0,0,0-.171.282,1.545,1.545,0,0,0,2.381-.053.172.172,0,0,0-.182-.275A3.669,3.669,0,0,1,4.35,24.35Z" transform="translate(120.203 239.361)" fill="#fff"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

@ -1,6 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
<g id="Group_7734" data-name="Group 7734" transform="translate(-111 -245.557)">
<circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#BE332F"/>
<g id="Group_7714" data-name="Group 7714" transform="translate(-111 -245.557)">
<circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#c6903e"/>
<g id="user_19_" data-name="user (19)" transform="translate(123.58 256.534)">
<g id="Group_7233" data-name="Group 7233" transform="translate(3.133)">
<g id="Group_7232" data-name="Group 7232">

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -1,6 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
<g id="Group_7736" data-name="Group 7736" transform="translate(-111 -245.557)">
<circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#BE332F"/>
<g id="Group_7716" data-name="Group 7716" transform="translate(-111 -245.557)">
<circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#c6903e"/>
<g id="Pin" transform="translate(123.979 255.501)">
<path id="Path_4580" data-name="Path 4580" d="M15.542,0A7.552,7.552,0,0,0,8,7.542c0,5.414,7.026,12.2,7.325,12.481a.311.311,0,0,0,.434,0c.3-.286,7.325-7.067,7.325-12.481A7.552,7.552,0,0,0,15.542,0Zm0,11A3.457,3.457,0,1,1,19,7.542,3.457,3.457,0,0,1,15.542,11Z" transform="translate(-8)" fill="#fff"/>
</g>

Before

Width:  |  Height:  |  Size: 678 B

After

Width:  |  Height:  |  Size: 678 B

@ -148,7 +148,7 @@ ion-label {
.loading-gif {
background: transparent !important;
width: 100px;
height: 120px;
height: 100px;
}
#custom-progress-loader .container {

@ -118,7 +118,7 @@
--light: #ffffff;
--dark: black;
--gray: #e4e5e7;
--custgreen: #44A7A1;
--custgreen: #c6903e;
--cusgray: #d9d9d9;
--darkgray: #7F8C8D;
--grayBG: #acacac;

Loading…
Cancel
Save