From f07876df7e06258c82ee509bc4cfb26037242b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Popovics=20Andr=C3=A1s?= Date: Wed, 5 Jul 2017 19:09:04 +0100 Subject: [PATCH] Responsive height for login component (#2049) --- .../app/components/login/login-demo.component.css | 4 ++-- .../app/components/login/login-demo.component.html | 14 ++++++++++++++ .../app/components/login/login-demo.component.ts | 1 + .../src/components/alfresco-login.component.css | 1 - .../src/components/alfresco-login.component.html | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/demo-shell-ng2/app/components/login/login-demo.component.css b/demo-shell-ng2/app/components/login/login-demo.component.css index 3357a12025..da3d5298f5 100644 --- a/demo-shell-ng2/app/components/login/login-demo.component.css +++ b/demo-shell-ng2/app/components/login/login-demo.component.css @@ -16,8 +16,8 @@ } .toggle { - width: 120px; - margin: 20px; + width: 190px; + margin: 5px; padding: 5px; } diff --git a/demo-shell-ng2/app/components/login/login-demo.component.html b/demo-shell-ng2/app/components/login/login-demo.component.html index 0cd3e7d3df..4203567ec1 100644 --- a/demo-shell-ng2/app/components/login/login-demo.component.html +++ b/demo-shell-ng2/app/components/login/login-demo.component.html @@ -21,6 +21,12 @@ CSRF

+

+ +

@@ -34,6 +40,8 @@ [providers]="providers" [fieldsValidation]="customValidation" [disableCsrf]="disableCsrf" + [showLoginActions]="showFooter" + [showRememberMe]="showFooter" (onSuccess)="onLogin($event)" (onError)="onError($event)">
@@ -57,5 +65,11 @@ CSRF

+

+ +

diff --git a/demo-shell-ng2/app/components/login/login-demo.component.ts b/demo-shell-ng2/app/components/login/login-demo.component.ts index 91e9e16dcb..b02d1d821f 100644 --- a/demo-shell-ng2/app/components/login/login-demo.component.ts +++ b/demo-shell-ng2/app/components/login/login-demo.component.ts @@ -36,6 +36,7 @@ export class LoginDemoComponent implements OnInit { disableCsrf: boolean = false; isECM: boolean = true; isBPM: boolean = false; + showFooter: boolean = true; customMinLenght: number = 2; constructor(private router: Router, diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css index 4b583d7c13..eed39cb457 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css @@ -42,7 +42,6 @@ box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.24), 0 0 2px 0 rgba(0, 0, 0, 0.12); width: 450px; min-width: 350px; - min-height: 450px; padding: 21px 64px 34px 64px; box-sizing: border-box; } diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html index 7cb0cbbb48..09851f9928 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html @@ -85,7 +85,7 @@ {{ 'LOGIN.LABEL.REMEMBER' | translate }} -