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

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2016-11-11 22:48:47 +03:00
parent 930f6dbb6d
commit d3f8fa4308
4 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dev/Styles/Layout.less
View file

@ -2,10 +2,15 @@
#rl-bg { #rl-bg {
z-index: -1; z-index: -1;
position: absolute; position: absolute;
left: -0; left: 0;
right: -25px; right: 0;
top: 0; top: 0;
bottom: -25px; bottom: 0;
&.animated {
right: -25px;
bottom: -25px;
}
} }
#rl-content { #rl-content {

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

@ -490,6 +490,8 @@ class LoginUserView extends AbstractViewNext
winHeightHalf = winHeight / 2, winHeightHalf = winHeight / 2,
winWidthHalf = winWidth / 2; winWidthHalf = winWidth / 2;
$bg.addClass('animated');
$('#rl-app').on('mousemove', _.throttle((e) => { $('#rl-app').on('mousemove', _.throttle((e) => {
$bg.css({ $bg.css({
top: height * (e.pageY - winHeightHalf) * -1 - movementStrength, top: height * (e.pageY - winHeightHalf) * -1 - movementStrength,

15
rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
View file

@ -239,7 +239,7 @@ class HtmlUtils
$oWrapHtml->setAttribute($sKey, $sValue); $oWrapHtml->setAttribute($sKey, $sValue);
} }
$oWrapDom = $oDom->createElement('div', 'xxx'); $oWrapDom = $oDom->createElement('div', '___xxx___');
$oWrapDom->setAttribute('data-x-div-type', 'body'); $oWrapDom->setAttribute('data-x-div-type', 'body');
foreach ($aBodylAttrs as $sKey => $sValue) foreach ($aBodylAttrs as $sKey => $sValue)
{ {
@ -250,7 +250,7 @@ class HtmlUtils
$sWrp = $oDom->saveHTML($oWrapHtml); $sWrp = $oDom->saveHTML($oWrapHtml);
$sResult = \str_replace('xxx', $sResult, $sWrp); $sResult = \str_replace('___xxx___', $sResult, $sWrp);
} }
$sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult); $sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult);
@ -280,17 +280,6 @@ class HtmlUtils
$sBodyAttrs = $aMatch[1]; $sBodyAttrs = $aMatch[1];
} }
// $iPos = \stripos($sHtml, '<body>');
// if (0 < $iPos)
// {
// $sHtml = \substr($sHtml, $iPos);
// }
// else
// {
// $iPos = \stripos($sHtml, '<body ');
// $sHtml = 0 < $iPos ? \substr($sHtml, $iPos) : $sHtml;
// }
$sHtml = \preg_replace('/<head([^>]*)>/si', '', $sHtml); $sHtml = \preg_replace('/<head([^>]*)>/si', '', $sHtml);
$sHtml = \preg_replace('/<body([^>]*)>/si', '', $sHtml); $sHtml = \preg_replace('/<body([^>]*)>/si', '', $sHtml);
$sHtml = \preg_replace('/<\/body>/i', '', $sHtml); $sHtml = \preg_replace('/<\/body>/i', '', $sHtml);

2
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -8470,7 +8470,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
/** /**
* @param \Imagine\Image\AbstractImage $oImage * @param \Imagine\Image\AbstractImage $oImage
*/ */
private function correctImageOrientation($oImage, $bDetectImageOrientation = true, $iThumbnailBoxSize = null) public function correctImageOrientation($oImage, $bDetectImageOrientation = true, $iThumbnailBoxSize = null)
{ {
$iOrientation = 1; $iOrientation = 1;
if ($bDetectImageOrientation && \MailSo\Base\Utils::FunctionExistsAndEnabled('exif_read_data') && if ($bDetectImageOrientation && \MailSo\Base\Utils::FunctionExistsAndEnabled('exif_read_data') &&