From 2d8a4a923f0ff02fff2aa74ac2a2aea4d860fe41 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 19:00:47 +0000 Subject: [PATCH] Fix login dialog layout. Rearrange login dialog distinguish better between logging und registering. --- view/templates/login.tpl | 18 ++++++++------ view/theme/vier/mobile.css | 7 ++++++ view/theme/vier/style.css | 50 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 8 deletions(-) diff --git a/view/templates/login.tpl b/view/templates/login.tpl index e1e8c5f3a..c2dac46f6 100644 --- a/view/templates/login.tpl +++ b/view/templates/login.tpl @@ -4,11 +4,14 @@
-
{{$login}}
+

{{$login}}

{{include file="field_input.tpl" field=$lname}} {{include file="field_password.tpl" field=$lpassword}} +
{{if $openid}} @@ -17,16 +20,11 @@
{{/if}} - {{include file="field_checkbox.tpl" field=$lremember}} - - -
+ + {{include file="field_checkbox.tpl" field=$lremember}} {{foreach $hiddens as $k=>$v}} @@ -35,5 +33,9 @@ + diff --git a/view/theme/vier/mobile.css b/view/theme/vier/mobile.css index 66721a1b8..b528ca4bd 100644 --- a/view/theme/vier/mobile.css +++ b/view/theme/vier/mobile.css @@ -91,6 +91,13 @@ nav ul { width: 100% !important; height: 110px !important; } + #login-extra-links, #login-form { + /* width: 341px; */ + width: 100%; + } + #id_remember_label { + width: unset; + } } @media screen and (max-width: 480px) { diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 710c76f6a..aad5d4384 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2422,10 +2422,60 @@ aside #div_id_remember label { float: inherit; } +#login-group { + overflow: hidden; +} + +#login-head { + position: unset; + width: unset; + height: unset; + margin-bottom: 10px; +} + +div #wrapper_username { + padding: 0px; +} + +div #wrapper_password { + padding: 0px; + margin-bottom: 0px; +} + +#div_id_remember { + float: left; + width: unset; +} + +#remember_tip { + display: none; +} + +#login-submit-wrapper { + float: right; +} + +#login-form { + margin-top: 20px; +} + +#login-extra-links, #login-form { + /* width: 341px; */ + width: 341px; + clear: both; + border-top: 3px solid white; + padding-top: 20px; +} + aside div #login-submit-button { margin-left:0px; } +#login-lost-password-link { + margin-bottom: 10px; + float: right; +} + aside #register-link, aside #lost-password-link { display: block; }