From 4adc672ccd7db75af3385393f4dcac9301446e21 Mon Sep 17 00:00:00 2001 From: djmaze Date: Thu, 26 Nov 2020 10:41:53 +0100 Subject: [PATCH] Cleanup Login and removed the ancient obsolete
with small redesign Also placed the loading description above the login form --- dev/Styles/Animations.less | 10 +- dev/Styles/Login.less | 86 +++---- dev/Styles/Main.less | 11 - dev/Styles/_End.less | 8 - dev/View/User/Login.js | 7 +- .../0.0.0/app/libraries/RainLoop/Actions.php | 1 - .../libraries/RainLoop/Config/Application.php | 2 - .../app/libraries/RainLoop/ServiceActions.php | 6 - .../app/templates/Views/Admin/AdminLogin.html | 76 +++--- .../0.0.0/app/templates/Views/User/Login.html | 234 +++++++++--------- .../templates/Views/User/LoginWelcome.html | 4 - snappymail/v/0.0.0/themes/Mobile/ext.less | 18 -- 12 files changed, 192 insertions(+), 271 deletions(-) delete mode 100644 snappymail/v/0.0.0/app/templates/Views/User/LoginWelcome.html delete mode 100644 snappymail/v/0.0.0/themes/Mobile/ext.less diff --git a/dev/Styles/Animations.less b/dev/Styles/Animations.less index 11262ff4b..8d82d37b6 100644 --- a/dev/Styles/Animations.less +++ b/dev/Styles/Animations.less @@ -80,24 +80,24 @@ html.no-mobile { } } - &.no-mobile .b-login-content .errorAnimated { + .b-login-content .errorAnimated { animation: login-form-shake 400ms ease-in-out; } - &.no-mobile .b-login-content .errorAnimated .buttonLogin { + .b-login-content .errorAnimated .buttonLogin { color: #b94a48; font-weight: bold; } - &.no-mobile .b-login-content .afterLoginHide { + .b-login-content .afterLoginHide { opacity: 0; } - &.no-mobile .btn-group.dropdown.colored-toggle.open .animate-this-icon-on-open { + .btn-group.dropdown.colored-toggle.open .animate-this-icon-on-open { animation: bounce-me .5s linear; } - &.no-mobile .b-login-content .loginFormWrapper { + .b-login-content .loginFormWrapper { transition: all 0.3s ease-out; } diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less index 45377f3c6..39edbf8db 100644 --- a/dev/Styles/Login.less +++ b/dev/Styles/Login.less @@ -1,59 +1,36 @@ +.rl-view-model { + &.RL-Login, &.RL-AdminLogin { + position: fixed; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + width: 100%; + max-width: 450px; + z-index: 5; + } +} + .b-login-content { - height: 100%; - text-align: center; - .loginFormWrapper { - - display: inline-block; - vertical-align: middle; - text-align: center; - perspective: 500px; + position: relative; .descWrapper { - margin-bottom: 10px; + text-align: center; .desc { - font-size: 18px; - padding: 2px; + font-size: 30px; } } - .alertError { - max-width: 450px; - } - - .wrapper-parent { - } - .loginForm { background-color: #efefef; - text-align: left; color: #333; margin: 0; - float: none; - width: 303px; } - .loginWelcomeForm { - display: none; - } - - .welcome-on { - display: block; - } - - .welcome-off { - display: none; - } - -/* .control-label { - font-size: 16px; - line-height: 30px; - }*/ - .controls, .control-group { margin-bottom: 25px; } @@ -62,11 +39,6 @@ padding: 40px 40px 20px 40px; } - #recaptcha_image img { - border: 1px solid #ccc; - border-radius: 3px; - } - .controls { .inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode { font-size: 18px; @@ -80,18 +52,10 @@ } } - .languageLabel { - margin-top: 5px; - } - .signMeLabel .e-checkbox { margin-top: 5px; } - .languageLabel { - margin-right: 5px; - } - .input-append .add-on { position: relative; height: 30px; @@ -116,6 +80,10 @@ .controls.error .add-on i, .control-group.error .add-on i { color: #b94a48; } + + .e-mobile-switcher { + text-align: center; + } } .buttonLogin { @@ -123,15 +91,17 @@ } .alert { - margin: 0 0 20px 0; - text-align: left; + position: absolute; + left: 0; + right: 0; + z-index: 1; } .flag-selector { margin-bottom: 0; } - .social-buttons { + .language-buttons { margin-top: 5px; } @@ -141,6 +111,14 @@ } } +@media screen and (max-width: 480px) { + .b-login-content .loginFormWrapper { + .wrapper { + padding: 30px 4vw 10px; + } + } +} + @keyframes loginRotation { to {transform: rotate(1turn);} } diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less index ff703715c..e7aec74ff 100644 --- a/dev/Styles/Main.less +++ b/dev/Styles/Main.less @@ -32,17 +32,6 @@ option:disabled { cursor: not-allowed; } -body:before { - content: ""; - position: fixed; - top: -10px; - left: 0; - width: 100%; - height: 8px; - z-index: 100; - box-shadow: 0 0 10px rgba(0,0,0,.6); -} - * { outline: none; } diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less index 8ecd8be48..bf1dbc638 100644 --- a/dev/Styles/_End.less +++ b/dev/Styles/_End.less @@ -1,12 +1,4 @@ -.rl-view-model { - &.RL-Login, &.RL-LoginNew, &.RL-AdminLogin { - position: relative; - height: 100%; - z-index: 5; - } -} - .mfp-container .mfp-figure { min-height: 300px; min-width: 300px; diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js index b80928d62..17283cf4d 100644 --- a/dev/View/User/Login.js +++ b/dev/View/User/Login.js @@ -38,7 +38,8 @@ class LoginUserView extends AbstractViewNext { this.hideSubmitButton = Settings.app('hideSubmitButton'); this.addObservables({ - welcome: !!Settings.get('UseLoginWelcomePage'), + loadingDesc: Settings.get('LoadingDescription'), + email: '', password: '', signMe: false, @@ -204,10 +205,6 @@ class LoginUserView extends AbstractViewNext { return true; } - displayMainForm() { - this.welcome(false); - } - onShow() { rl.route.off(); } diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index eb4eeaedf..6b3c7336c 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1058,7 +1058,6 @@ class Actions 'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''), 'DetermineUserLanguage' => (bool)$oConfig->Get('login', 'determine_user_language', true), 'DetermineUserDomain' => (bool)$oConfig->Get('login', 'determine_user_domain', false), - 'UseLoginWelcomePage' => (bool)$oConfig->Get('login', 'welcome_page', false), 'StartupUrl' => \trim(\ltrim(\trim($oConfig->Get('labs', 'startup_url', '')), '#/')), 'SieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false), 'ContactsIsAllowed' => false, diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index 723df2ce4..683d94738 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -206,8 +206,6 @@ class Application extends \RainLoop\Config\AbstractConfig 'determine_user_language' => array(true, ''), 'determine_user_domain' => array(false, ''), - 'welcome_page' => array(false, ''), - 'hide_submit_button' => array(true), 'forgot_password_link_url' => array('', ''), diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php index b84742698..26db83e30 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php @@ -634,7 +634,6 @@ class ServiceActions $aResult = array(); $sThemeFile = ($bCustomTheme ? APP_INDEX_ROOT_PATH : APP_VERSION_ROOT_PATH).'themes/'.$sRealTheme.'/styles.less'; - $sThemeExtFile = ($bCustomTheme ? APP_INDEX_ROOT_PATH : APP_VERSION_ROOT_PATH).'themes/'.$sRealTheme.'/ext.less'; $sThemeValuesFile = APP_VERSION_ROOT_PATH.'app/templates/Themes/values.less'; $sThemeTemplateFile = APP_VERSION_ROOT_PATH.'app/templates/Themes/template.less'; @@ -648,11 +647,6 @@ class ServiceActions $aResult[] = \file_get_contents($sThemeValuesFile); $aResult[] = \file_get_contents($sThemeFile); $aResult[] = \file_get_contents($sThemeTemplateFile); - - if (\is_file($sThemeExtFile)) - { - $aResult[] = \file_get_contents($sThemeExtFile); - } } $aResult[] = $this->Plugins()->CompileCss($bAdmin); diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html index 169fbaeae..27761b82d 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html @@ -1,46 +1,44 @@
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html index b81439c54..4b780ac3d 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html @@ -1,130 +1,128 @@ +
+ + +   + + + + + + +   + + + + +
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/LoginWelcome.html b/snappymail/v/0.0.0/app/templates/Views/User/LoginWelcome.html deleted file mode 100644 index 923c03d5a..000000000 --- a/snappymail/v/0.0.0/app/templates/Views/User/LoginWelcome.html +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/snappymail/v/0.0.0/themes/Mobile/ext.less b/snappymail/v/0.0.0/themes/Mobile/ext.less deleted file mode 100644 index cd7e68f97..000000000 --- a/snappymail/v/0.0.0/themes/Mobile/ext.less +++ /dev/null @@ -1,18 +0,0 @@ - -.b-login-content .loginFormWrapper { - width: 90%; - .wrapper { - padding: 30px 30px 10px 30px; - } -} - -.thm-login { - - width: 100% !important; - width: calc(~'100% - 60px') !important; - max-width: 303px !important; - - box-shadow: 0 1px 4px #ccc !important; - box-shadow: 0 1px 5px rgba(0,0,0,.2) !important; - box-shadow: 0 0 0 1px rgba(0,0,0,.04),0 1px 5px rgba(0,0,0,.1) !important; -} \ No newline at end of file