Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 17:07:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup Login and removed the ancient obsolete <center> with small redesign

Browse source 
Also placed the loading description above the login form
This commit is contained in:
djmaze 2020-11-26 10:41:53 +01:00
parent 2047525ce6
commit 4adc672ccd
12 changed files with 192 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dev/Styles/Animations.less
View file

@ -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; animation: login-form-shake 400ms ease-in-out;
} }
&.no-mobile .b-login-content .errorAnimated .buttonLogin { .b-login-content .errorAnimated .buttonLogin {
color: #b94a48; color: #b94a48;
font-weight: bold; font-weight: bold;
} }
&.no-mobile .b-login-content .afterLoginHide { .b-login-content .afterLoginHide {
opacity: 0; 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; animation: bounce-me .5s linear;
} }
&.no-mobile .b-login-content .loginFormWrapper { .b-login-content .loginFormWrapper {
transition: all 0.3s ease-out; transition: all 0.3s ease-out;
} }

86
dev/Styles/Login.less
View file

@ -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 { .b-login-content {
height: 100%;
text-align: center;
.loginFormWrapper { .loginFormWrapper {
position: relative;
display: inline-block;
vertical-align: middle;
text-align: center;
perspective: 500px;
.descWrapper { .descWrapper {
margin-bottom: 10px; margin-bottom: 10px;
text-align: center;
.desc { .desc {
font-size: 18px; font-size: 30px;
padding: 2px;
} }
} }
.alertError {
max-width: 450px;
}
.wrapper-parent {
}
.loginForm { .loginForm {
background-color: #efefef; background-color: #efefef;
text-align: left;
color: #333; color: #333;
margin: 0; 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 { .controls, .control-group {
margin-bottom: 25px; margin-bottom: 25px;
} }
@ -62,11 +39,6 @@
padding: 40px 40px 20px 40px; padding: 40px 40px 20px 40px;
} }
#recaptcha_image img {
border: 1px solid #ccc;
border-radius: 3px;
}
.controls { .controls {
.inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode { .inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode {
font-size: 18px; font-size: 18px;
@ -80,18 +52,10 @@
} }
} }
.languageLabel {
margin-top: 5px;
}
.signMeLabel .e-checkbox { .signMeLabel .e-checkbox {
margin-top: 5px; margin-top: 5px;
} }
.languageLabel {
margin-right: 5px;
}
.input-append .add-on { .input-append .add-on {
position: relative; position: relative;
height: 30px; height: 30px;
@ -116,6 +80,10 @@
.controls.error .add-on i, .control-group.error .add-on i { .controls.error .add-on i, .control-group.error .add-on i {
color: #b94a48; color: #b94a48;
} }
.e-mobile-switcher {
text-align: center;
}
} }
.buttonLogin { .buttonLogin {
@ -123,15 +91,17 @@
} }
.alert { .alert {
margin: 0 0 20px 0; position: absolute;
text-align: left; left: 0;
right: 0;
z-index: 1;
} }
.flag-selector { .flag-selector {
margin-bottom: 0; margin-bottom: 0;
} }
.social-buttons { .language-buttons {
margin-top: 5px; margin-top: 5px;
} }
@ -141,6 +111,14 @@
} }
} }
@media screen and (max-width: 480px) {
.b-login-content .loginFormWrapper {
.wrapper {
padding: 30px 4vw 10px;
}
}
}
@keyframes loginRotation { @keyframes loginRotation {
to {transform: rotate(1turn);} to {transform: rotate(1turn);}
} }

11
dev/Styles/Main.less
View file

@ -32,17 +32,6 @@ option:disabled {
cursor: not-allowed; 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; outline: none;
} }

8
dev/Styles/_End.less
View file

@ -1,12 +1,4 @@
.rl-view-model {
&.RL-Login, &.RL-LoginNew, &.RL-AdminLogin {
position: relative;
height: 100%;
z-index: 5;
}
}
.mfp-container .mfp-figure { .mfp-container .mfp-figure {
min-height: 300px; min-height: 300px;
min-width: 300px; min-width: 300px;

7
dev/View/User/Login.js
View file

@ -38,7 +38,8 @@ class LoginUserView extends AbstractViewNext {
this.hideSubmitButton = Settings.app('hideSubmitButton'); this.hideSubmitButton = Settings.app('hideSubmitButton');
this.addObservables({ this.addObservables({
welcome: !!Settings.get('UseLoginWelcomePage'), loadingDesc: Settings.get('LoadingDescription'),
email: '', email: '',
password: '', password: '',
signMe: false, signMe: false,
@ -204,10 +205,6 @@ class LoginUserView extends AbstractViewNext {
return true; return true;
} }
displayMainForm() {
this.welcome(false);
}
onShow() { onShow() {
rl.route.off(); rl.route.off();
} }

1
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1058,7 +1058,6 @@ class Actions
'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''), 'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''),
'DetermineUserLanguage' => (bool)$oConfig->Get('login', 'determine_user_language', true), 'DetermineUserLanguage' => (bool)$oConfig->Get('login', 'determine_user_language', true),
'DetermineUserDomain' => (bool)$oConfig->Get('login', 'determine_user_domain', false), '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', '')), '#/')), 'StartupUrl' => \trim(\ltrim(\trim($oConfig->Get('labs', 'startup_url', '')), '#/')),
'SieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false), 'SieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false),
'ContactsIsAllowed' => false, 'ContactsIsAllowed' => false,

2
snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -206,8 +206,6 @@ class Application extends \RainLoop\Config\AbstractConfig
'determine_user_language' => array(true, ''), 'determine_user_language' => array(true, ''),
'determine_user_domain' => array(false, ''), 'determine_user_domain' => array(false, ''),
'welcome_page' => array(false, ''),
'hide_submit_button' => array(true), 'hide_submit_button' => array(true),
'forgot_password_link_url' => array('', ''), 'forgot_password_link_url' => array('', ''),

6
snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -634,7 +634,6 @@ class ServiceActions
$aResult = array(); $aResult = array();
$sThemeFile = ($bCustomTheme ? APP_INDEX_ROOT_PATH : APP_VERSION_ROOT_PATH).'themes/'.$sRealTheme.'/styles.less'; $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'; $sThemeValuesFile = APP_VERSION_ROOT_PATH.'app/templates/Themes/values.less';
$sThemeTemplateFile = APP_VERSION_ROOT_PATH.'app/templates/Themes/template.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($sThemeValuesFile);
$aResult[] = \file_get_contents($sThemeFile); $aResult[] = \file_get_contents($sThemeFile);
$aResult[] = \file_get_contents($sThemeTemplateFile); $aResult[] = \file_get_contents($sThemeTemplateFile);
if (\is_file($sThemeExtFile))
{
$aResult[] = \file_get_contents($sThemeExtFile);
}
} }
$aResult[] = $this->Plugins()->CompileCss($bAdmin); $aResult[] = $this->Plugins()->CompileCss($bAdmin);

2
snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
View file

@ -1,6 +1,5 @@
<div class="b-login-content"> <div class="b-login-content">
<div class="loginFormWrapper" data-bind="css: {'afterLoginHide': formHidden}"> <div class="loginFormWrapper" data-bind="css: {'afterLoginHide': formHidden}">
<center>
<div class="alert alertError" data-bind="visible: '' !== submitError()"> <div class="alert alertError" data-bind="visible: '' !== submitError()">
<button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button> <button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button>
<span data-bind="text: submitError"></span> <span data-bind="text: submitError"></span>
@ -40,7 +39,6 @@
</div> </div>
</form> </form>
</div> </div>
</center>
</div> </div>
<div> <div>

14
snappymail/v/0.0.0/app/templates/Views/User/Login.html
View file

@ -1,6 +1,9 @@
<div class="b-login-content"> <div class="b-login-content">
<div class="loginFormWrapper" data-bind="css: {'afterLoginHide': formHidden}"> <div class="loginFormWrapper" data-bind="css: {'afterLoginHide': formHidden}">
<center class="plugin-mark-Login-BeforeLogo"> <div class="descWrapper thm-login-desc plugin-mark-Login-AfterLogoDescription"
data-bind="visible: '' !== loadingDesc">
<span class="desc" data-bind="text: loadingDesc"></span>
</div>
<div class="alert alertError" data-bind="hidden: !submitError()" hidden=""> <div class="alert alertError" data-bind="hidden: !submitError()" hidden="">
<button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button> <button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button>
<span data-bind="text: submitError"></span> <span data-bind="text: submitError"></span>
@ -10,12 +13,8 @@
</div> </div>
</div> </div>
<div class="wrapper-parent"> <div class="wrapper-parent">
<div class="wrapper loginWelcomeForm thm-login-text" data-bind="css: {'welcome-on': welcome}">
<!-- ko template: { name: 'LoginWelcome' } -->
<!-- /ko -->
</div>
<form class="wrapper submitting-pane loginForm thm-login thm-login-text" action="#/" <form class="wrapper submitting-pane loginForm thm-login thm-login-text" action="#/"
data-bind="submit: submitForm, css: {'errorAnimated': formError, 'welcome-off': welcome, 'submitting': submitRequest()}"> data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
<div class="controls plugin-mark-Login-TopControlGroup" <div class="controls plugin-mark-Login-TopControlGroup"
data-bind="css: {'error': emailError, 'animated': emailErrorAnimation}"> data-bind="css: {'error': emailError, 'animated': emailErrorAnimation}">
<div class="input-append"> <div class="input-append">
@ -74,7 +73,7 @@
</button> </button>
</div> </div>
<div class="controls clearfix" style="margin-bottom: 10px"> <div class="controls clearfix" style="margin-bottom: 10px">
<div class="pull-right social-buttons"> <div class="pull-right language-buttons">
<a href="#" tabindex="-1" class="language-button" <a href="#" tabindex="-1" class="language-button"
data-bind="visible: allowLanguagesOnLogin, click: selectLanguage, tooltip: 'POPUPS_LANGUAGES/TITLE_LANGUAGES'"> data-bind="visible: allowLanguagesOnLogin, click: selectLanguage, tooltip: 'POPUPS_LANGUAGES/TITLE_LANGUAGES'">
<i data-bind="css: langRequest() ? 'icon-spinner animated' : 'icon-world'"></i> <i data-bind="css: langRequest() ? 'icon-spinner animated' : 'icon-world'"></i>
@ -125,6 +124,5 @@
</a> </a>
</span> </span>
</div> </div>
</center>
</div> </div>
</div> </div>

4
snappymail/v/0.0.0/app/templates/Views/User/LoginWelcome.html
View file

@ -1,4 +0,0 @@
<div class="b-login--welcome-content">
<i class="icon-mail iconsize50" style="cursor: pointer" data-bind="click: displayMainForm"></i>
<br /><br />
</div>

18
snappymail/v/0.0.0/themes/Mobile/ext.less
View file

@ -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;
}