diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html
index 0221f3ab..5b5e4c97 100644
--- a/Mohem/src/app/authentication/login/login.component.html
+++ b/Mohem/src/app/authentication/login/login.component.html
@@ -92,7 +92,7 @@
{{ts.trPK('login','forgot-password')}}
-->
-
+
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts
index 0056da73..ddbffa77 100644
--- a/Mohem/src/app/authentication/login/login.component.ts
+++ b/Mohem/src/app/authentication/login/login.component.ts
@@ -16,6 +16,8 @@ import { Password } from '../models/password';
import { CheckUserAuthenticationRequest } from 'src/app/hmg-common/services/authentication/models/check-user-auth.request';
import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response';
import { PushService } from 'src/app/hmg-common/services/push/push.service';
+import { KeyboardService } from 'src/app/hmg-common/services/keyboard/keyboard.service';
+import { KeyboardStatusModel } from 'src/app/hmg-common/services/keyboard/keyboard-status.model';
@Component({
selector: 'login',
@@ -39,7 +41,8 @@ export class LoginComponent implements OnInit, OnDestroy {
public splash: SplashScreen,
public sharedData: SharedDataService,
public plt: Platform,
- public pushService: PushService
+ public pushService: PushService,
+ public keyboardService: KeyboardService
) {
this.events.subscribe('logoutFlage', logoutFlage => {
console.log('login compont logoutFlage: ' + logoutFlage);
@@ -93,6 +96,7 @@ export class LoginComponent implements OnInit, OnDestroy {
logoutFlage: boolean ;
getuser: any = '';
getlastlogin: any;
+ public keyboardOpened = false;
private checkUserResult: CheckUserAuthenticationResponse;
@@ -104,6 +108,7 @@ export class LoginComponent implements OnInit, OnDestroy {
// );
// console.log("this.getlastlogin"+ this.getlastlogin);
// }
+ this.monitorKeyboardChange();
this.currentLang = TranslatorService.getCurrentLanguageCode();
console.log(TranslatorService.CURRENT_LANGUAGE)
console.log(TranslatorService.EN)
@@ -418,6 +423,10 @@ export class LoginComponent implements OnInit, OnDestroy {
});
}
-
+ private monitorKeyboardChange() {
+ this.events.subscribe ( KeyboardService.KEYBOARD_STATUS , ( status: KeyboardStatusModel) => {
+ this.keyboardOpened = status.opened;
+ });
+ }
}
diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.scss b/Mohem/src/app/authentication/sms-page/sms-page.page.scss
index 78c9db1f..986beeb9 100644
--- a/Mohem/src/app/authentication/sms-page/sms-page.page.scss
+++ b/Mohem/src/app/authentication/sms-page/sms-page.page.scss
@@ -50,7 +50,7 @@ ion-input {
line-height: 0;
font-size: 32px;
//border: solid 1px #ccc;
- border: solid 0.01cm #000000;
+ border: 1px solid #ccc !important;
//box-shadow: 0 0 5px #ccc inset;
outline: none;
width: 20%;