fixed moe issues

MOE_MAIN-COLOR_CHANGES
umasoodch 3 years ago
parent 191c8e6b50
commit 5020860449

@ -2,7 +2,7 @@
<ion-split-pane>
<ion-menu [swipeGesture]="false" side='start' *ngIf="direction ==='ltr'">
<ion-content class="sidebar-menu">
<div class="header-div">
<div class="header-div" style="visibility: hidden;">
<!-- <div>
<img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important;" src="../assets/imgs/close_menu_icon.png ">
@ -113,21 +113,35 @@
</ion-list>
<div class="" style="text-align:center">
<!-- <img src="{{companyUrl}}" class="CompanyImg logoImg"> -->
<!-- <div class="" style="text-align:center">
<img src="../assets/icon/new-design/moe-logo.png" class="CompanyImg logoImg">
</div>
<div class="menuFooter" >
<div> <img src="../assets/imgs/CSLogo.png" class="CompanyImg" ></div>
<p class="companyTxt">{{companyDesc}}</p>
</div>
</div> -->
</ion-content>
<ion-footer style="padding: 0px;">
<ion-row>
<div class="footer-container">
<ion-col class="colPad" size="9">
<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" >
<p class="companyTxt">{{companyDesc}}</p>
</div> -->
</ion-footer>
</ion-menu>
<ion-menu [swipeGesture]="false" side='end' *ngIf="direction ==='rtl'">
<ion-content class="sidebar-menu">
<div class="header-div">
<div class="header-div" style="visibility: hidden;">
<!-- <div>
<img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important; margin-right: 15px;" src="../assets/imgs/close_menu_icon.png ">
</div> -->
@ -258,16 +272,31 @@
</ion-item> -->
</ion-list>
<div class="" style="text-align:center">
<!-- <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'">
<!-- <img src="../assets/icon/new-design/moe-logo.png" class="CompanyImg" [ngClass]="TeamFlag!='true'? 'logoImg':'logoImgWithMyTeam'"> -->
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
</div>
<div class="menuFooter">
<div> <img src="../assets/icon/icon_CS.png" class="CompanyImg" ></div>
<p class="companyTxt">{{companyDesc}}</p>
</div>
<!-- </div> -->
</ion-content>
<ion-footer style="padding: 0px;" dir="ltr">
<ion-row>
<div class="footer-container">
<ion-col class="colPad" size="9">
<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" >
<p class="companyTxt">{{companyDesc}}</p>
</div> -->
</ion-footer>
</ion-menu>
<ion-router-outlet main></ion-router-outlet>
</ion-split-pane>

@ -81,9 +81,9 @@ hr {
.logout {
background-color: #44A7A1;
background-color: #99B8C6;
border: none;
color: white;
color: #004D71;
text-align: center;
text-decoration: none;
display: inline-block;
@ -99,9 +99,9 @@ hr {
}
.logout-ar {
background-color: #44A7A1;
background-color: #99B8C6;
border: none;
color: white;
color: #004D71;
text-align: center;
text-decoration: none;
display: inline-block;
@ -293,7 +293,8 @@ button.menu-item.item.item-block.item-ios {
.TxtPlace {
font-size: 20px;
color: #000;
color: #004D71;
font-weight: bold;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@ -304,7 +305,8 @@ button.menu-item.item.item-block.item-ios {
.TxtPlaces {
font-size: 14px;
color: #000;
color: #004D71;
font-weight: bold;
font-family: 'Inter' !important;
text-overflow: ellipsis;
overflow: hidden;
@ -348,7 +350,7 @@ button.menu-item.item.item-block.item-ios {
.companyTxt {
font-size: 12px;
color: var(--customnavy);
color: #004D71;
text-align: center;
font-family: 'Inter' !important;
}
@ -366,7 +368,7 @@ ion-thumbnail.menu-thumb {
}
.profile {
color: black !important;
color: #5C6F79 !important;
font-weight: bolder !important;
}
@ -403,4 +405,27 @@ ion-thumbnail.menu-thumb {
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;
}

@ -1,6 +1,7 @@
<app-generic-header
*ngIf="!accessFromOutSide"
showBack="true"
[moeImage]="false"
[headerText]="'login,verify-login' | translate">
</app-generic-header>
@ -31,9 +32,9 @@
-->
</ion-col>
</ion-row>
<div *ngIf="onlySMSBox"><p>{{ts.trPK('login','verify-login-with')}}</p></div>
<div *ngIf="!onlySMSBox && FFloginType == 2"><p>{{ts.trPK('login','verify-fingerprint')}}</p></div>
<div *ngIf="!onlySMSBox && FFloginType == 3"><p>{{ts.trPK('login','verify-faceId')}}</p></div>
<div *ngIf="onlySMSBox"><p class="p-color">{{ts.trPK('login','verify-login-with')}}</p></div>
<div *ngIf="!onlySMSBox && FFloginType == 2"><p class="p-color">{{ts.trPK('login','verify-fingerprint')}}</p></div>
<div *ngIf="!onlySMSBox && FFloginType == 3"><p class="p-color">{{ts.trPK('login','verify-faceId')}}</p></div>
</ion-col>
</ion-row>

@ -30,4 +30,9 @@
position: absolute;
left: 20px;
width: 10%;
}
.p-color {
color: #004D71;
font-weight: bold;
}

@ -36,8 +36,8 @@
<a>{{ts.trPK('login','signup')}}</a>
</div>
<div ng class="gridDiv" aria-disabled="true">
<button class="gridBtn" ion-button (click)="changeLanguage('2')" [ngClass]="{'active':currentLang ==2}">English</button>
<button class="gridBtn arTxt" ion-button (click)="changeLanguage('1')" [ngClass]="{'active':currentLang ==1}">عربي</button>
<button class="gridBtn border-moe-right" ion-button (click)="changeLanguage('2')" [ngClass]="{'active':currentLang ==2}">English</button>
<button class="gridBtn arTxt border-moe-left" ion-button (click)="changeLanguage('1')" [ngClass]="{'active':currentLang ==1}">عربي</button>
</div>
</div>
@ -66,8 +66,15 @@
<ion-footer *ngIf="!user" [ngStyle]="keyboardOpened === true ? {'display': 'none'} : {}" style="padding: 0px;">
<ion-row>
<ion-col class="colPad">
<img class="centerDiv logoFotor" src="../assets/imgs/CSLogo.png" />
<div class="footer-container">
<ion-col class="colPad" size="9">
<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>
</ion-footer>

@ -202,11 +202,11 @@ 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;
@ -275,4 +275,37 @@ img.centerDiv {
position: absolute;
left: 20px;
width: 10%;
}
.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;
}
.border-moe-right {
border-top-right-radius: 16px;
border-bottom-right-radius: 16px;
}
.border-moe-left {
border-top-left-radius: 16px;
border-bottom-left-radius: 16px;
}

@ -139,6 +139,10 @@ export class LoginComponent implements OnInit, OnDestroy {
this.backClicked();
}
start() {
this.cs.startLoading();
}
public changeLanguage(langNumber) {
console.log("current lang: " + this.currentLang)
console.log("click lang: " + langNumber)

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

@ -1,9 +1,14 @@
<ion-header>
<!-- <ion-header>
<ion-toolbar class="header-toolbar-new">
<nav-buttons></nav-buttons>
<ion-title [ngClass]=" direction === 'en' ? 'title' : 'title-ar'" color="light">{{headerTitle}}</ion-title>
</ion-toolbar>
</ion-header>
</ion-header> -->
<app-generic-header
[showBack]="true"
[headerText]="headerTitle">
</app-generic-header>
<ion-content>

@ -12,6 +12,11 @@
<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,6 +13,7 @@ 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;

@ -36,6 +36,6 @@
text-align: center;
margin-top: 10px;
color: #004D71;
font-weight: 600;
font-weight: bold;
letter-spacing: .6px;
}

@ -7,6 +7,7 @@
max-width: 105px;
height: 160px;
padding: 10px;
max-height: 155px;
}
.iconBox {
@ -19,7 +20,7 @@
// max-width: 45%;
// padding-bottom: 5px;
// padding-top: 5px;
display: block;
display: inline-block;
max-width: 67%;
padding-bottom: 9px;
padding-top: 5px;
@ -34,7 +35,7 @@
font-size: 25px;
font-weight: bold;
color: #004D71;
text-align: -webkit-auto;
text-align: center;
display: block;
}
}
@ -44,13 +45,22 @@ ion-app[dir="rtl"] .titleBox {
}
.pClass {
// color: #004D71;
// width: 85%;
// margin-top: 5px;
// font-weight: bold;
// text-align: -webkit-auto;
// display: block;
// font-size: 15px !important;
color: #004D71;
width: 85%;
width: 100%;
margin-top: 5px;
font-weight: bold;
text-align: -webkit-auto;
text-align: center;
display: block;
font-size: 15px !important;
font-size: 14px !important;
}
.iconFab {

@ -43,9 +43,10 @@ ion-title {
ion-label {
display: block;
color: black !important;
color: #004D71 !important;
font-size: 16px;
font-weight: bold;
// margin: 0px 10px 10px 10px;
}
.main-dashboard-container {

@ -103,7 +103,7 @@
<ion-item lines="none" style="display: flex;">
<ion-select style="min-width: 100%; height: 40px; padding-top: 5px;" [(ngModel)]="searchBy" (ionChange)="onChangeSelect($event)">
<ion-select-option value="1" ><p style="min-width: 100%; font-size: 11px; font-weight: bold;">{{'replacementRoll, workflow' | translate}}</p></ion-select-option>
<ion-select-option value="4" ><p style="min-width: 100%; font-size: 11px; font-weight: bold;">{{'replacementRoll, favorite' | translate}}</p></ion-select-option>
<!-- <ion-select-option value="4" ><p style="min-width: 100%; font-size: 11px; font-weight: bold;">{{'replacementRoll, favorite' | translate}}</p></ion-select-option> -->
<ion-select-option value="2" ><p style="min-width: 100%; font-size: 11px; font-weight: bold;">{{'replacementRoll, employee-id' | translate}}</p></ion-select-option>
<ion-select-option value="3" ><p style="min-width: 100%; font-size: 11px; font-weight: bold;">{{'replacementRoll, employee-email' | translate}}</p></ion-select-option>
<ion-select-option value="5" ><p style="min-width: 100%; font-size: 11px; font-weight: bold;">{{'replacementRoll, employee-name' | translate}}</p></ion-select-option>

@ -1314,7 +1314,7 @@ $actionBtnSize: 36px;
.name {
text-align: center;
letter-spacing: -0.84px;
color: #2B353E;
color: #004D71;
opacity: 1;
font-weight: bold;
line-height: 21px;
@ -1327,7 +1327,7 @@ $actionBtnSize: 36px;
font-size: 13px;
line-height: 6px;
letter-spacing: -0.52px;
color: #A2A2A2;
color: #004D71;
opacity: 1;
font-family: 'Inter' !important;
}
@ -1336,9 +1336,9 @@ $actionBtnSize: 36px;
.subTitle {
text-align: center;
letter-spacing: -0.52px;
color: #A2A2A2;
color: #004D71;
opacity: 1;
font-weight: bold;
font-size: 16px;
line-height: 0px;
margin-bottom: 7px;
@ -1348,7 +1348,7 @@ $actionBtnSize: 36px;
.boldText {
text-align: center;
letter-spacing: -0.64px;
color: #2B353E;
color: #5C6F79 !important;
opacity: 1;
font-family: 'Inter' !important;
font-size: 14px;
@ -1371,7 +1371,8 @@ $actionBtnSize: 36px;
line-height: 30px;
font-size: 20px;
letter-spacing: -0.8px;
color: #2B353E;
color: #004D71;
font-weight: bold;
opacity: 1;
margin-top: 12px;
margin-bottom: 2px;
@ -1383,7 +1384,8 @@ $actionBtnSize: 36px;
line-height: 30px;
font-size: 20px;
letter-spacing: -0.8px;
color: #2B353E;
color: #004D71;
font-weight: bold;
opacity: 1;
margin-top: -3px;
margin-bottom: 2px;
@ -1397,7 +1399,8 @@ $actionBtnSize: 36px;
line-height: 20px;
font-size: 13px;
letter-spacing: -0.52px;
color: #A2A2A2;
color: #5C6F79;
font-weight: bold;
opacity: 1;
}
@ -1407,7 +1410,8 @@ $actionBtnSize: 36px;
line-height: 20px;
font-size: 16px;
letter-spacing: -0.64px;
color: #2B353E;
color: #004D71;
font-weight: bold;
opacity: 1;
}
@ -1418,7 +1422,8 @@ $actionBtnSize: 36px;
line-height: 30px;
font-size: 20px;
letter-spacing: -0.8px;
color: #2B353E;
color: #004D71;
font-weight: bold;
opacity: 1;
margin-top: 12px;
margin-bottom: 2px;
@ -1430,7 +1435,8 @@ $actionBtnSize: 36px;
line-height: 30px;
font-size: 20px;
letter-spacing: -0.8px;
color: #2B353E;
color: #004D71;
font-weight: bold;
opacity: 1;
margin-top: -3px;
margin-bottom: 2px;
@ -1444,7 +1450,8 @@ $actionBtnSize: 36px;
line-height: 20px;
font-size: 13px;
letter-spacing: -0.52px;
color: #A2A2A2;
color: #5C6F79;
font-weight: bold;
opacity: 1;
}
@ -1453,7 +1460,8 @@ $actionBtnSize: 36px;
line-height: 20px;
font-size: 16px;
letter-spacing: -0.64px;
color: #2B353E;
color: #004D71;
font-weight: bold;
opacity: 1;
font-family: 'Inter' !important;
margin-top: 3px;

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 187 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 999 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 759 B

After

Width:  |  Height:  |  Size: 1.9 KiB

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

Loading…
Cancel
Save