Move "assets" to proper location in snappymail/v/0.0.0/static/
Before Width: | Height: | Size: 1.8 KiB |
|
@ -57,7 +57,7 @@ export const NotificationUserStore = new class {
|
||||||
if (DesktopNotifications && NotificationsGranted()) {
|
if (DesktopNotifications && NotificationsGranted()) {
|
||||||
const options = {
|
const options = {
|
||||||
body: text,
|
body: text,
|
||||||
icon: imageSrc || Links.staticLink('css/images/icon-message-notification.png'),
|
icon: imageSrc || Links.staticLink('images/icon-message-notification.png'),
|
||||||
data: messageData
|
data: messageData
|
||||||
};
|
};
|
||||||
if (messageData?.uid) {
|
if (messageData?.uid) {
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 250px;
|
width: 250px;
|
||||||
height: 200px;
|
height: 200px;
|
||||||
background: url("images/snappymail-logo.png") -30px -30px;
|
/* Yes this LESS css relative path quirk becomes ../ */
|
||||||
|
background: url(../../images/snappymail-logo.png) -30px -30px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
const gulp = require('gulp');
|
const gulp = require('gulp');
|
||||||
|
|
||||||
const { cleanStatic } = require('./tasks/common');
|
const { cleanStatic } = require('./tasks/common');
|
||||||
const { assets } = require('./tasks/assets');
|
|
||||||
const { js, jsLint } = require('./tasks/js');
|
const { js, jsLint } = require('./tasks/js');
|
||||||
const { css, cssLint } = require('./tasks/css');
|
const { css, cssLint } = require('./tasks/css');
|
||||||
const { vendors } = require('./tasks/vendors');
|
const { vendors } = require('./tasks/vendors');
|
||||||
|
@ -12,7 +11,7 @@ const clean = gulp.series(cleanStatic);
|
||||||
const lint = gulp.parallel(jsLint, cssLint);
|
const lint = gulp.parallel(jsLint, cssLint);
|
||||||
|
|
||||||
const buildState1 = gulp.parallel(js, css, vendors);
|
const buildState1 = gulp.parallel(js, css, vendors);
|
||||||
const buildState2 = gulp.series(clean, assets, buildState1);
|
const buildState2 = gulp.series(clean, buildState1);
|
||||||
|
|
||||||
const build = gulp.parallel(lint, buildState2);
|
const build = gulp.parallel(lint, buildState2);
|
||||||
|
|
||||||
|
|
|
@ -500,11 +500,13 @@ trait Messages
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if ('SPAM' === $sLearning) {
|
if ('SPAM' === $sLearning) {
|
||||||
|
// $this->MailClient()->MessageSetFlag($sFromFolder, $oUids, '\\junk');
|
||||||
$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK);
|
$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK);
|
||||||
$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK, false);
|
$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK, false);
|
||||||
} else if ('HAM' === $sLearning) {
|
} else if ('HAM' === $sLearning) {
|
||||||
$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK);
|
$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK);
|
||||||
$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK, false);
|
$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK, false);
|
||||||
|
// $this->MailClient()->MessageSetFlag($sFromFolder, $oUids, '\\junk', false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (\Throwable $oException)
|
catch (\Throwable $oException)
|
||||||
|
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 992 B After Width: | Height: | Size: 992 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 866 B After Width: | Height: | Size: 866 B |
Before Width: | Height: | Size: 335 B After Width: | Height: | Size: 335 B |
Before Width: | Height: | Size: 992 B After Width: | Height: | Size: 992 B |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 9.3 KiB |
|
@ -1,7 +0,0 @@
|
||||||
/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
|
|
||||||
const gulp = require('gulp');
|
|
||||||
const { config } = require('./config');
|
|
||||||
|
|
||||||
const assetsCopy = () => gulp.src(config.paths.assets.src).pipe(gulp.dest(config.paths.static));
|
|
||||||
|
|
||||||
exports.assets = gulp.series(assetsCopy);
|
|
|
@ -14,4 +14,4 @@ exports.copy = (sFile, sNewFile, done) => {
|
||||||
|
|
||||||
exports.getHead = () => config.head.agpl;
|
exports.getHead = () => config.head.agpl;
|
||||||
|
|
||||||
exports.cleanStatic = () => del(config.paths.static);
|
exports.cleanStatic = () => del(config.paths.staticJS) && del(config.paths.staticCSS);
|
||||||
|
|
|
@ -14,15 +14,10 @@ const config = {
|
||||||
};
|
};
|
||||||
|
|
||||||
config.paths.globjs = 'dev/**/*.js';
|
config.paths.globjs = 'dev/**/*.js';
|
||||||
config.paths.static = 'snappymail/v/' + config.devVersion + '/static/';
|
|
||||||
config.paths.staticJS = 'snappymail/v/' + config.devVersion + '/static/js/';
|
config.paths.staticJS = 'snappymail/v/' + config.devVersion + '/static/js/';
|
||||||
config.paths.staticMinJS = 'snappymail/v/' + config.devVersion + '/static/js/min/';
|
config.paths.staticMinJS = 'snappymail/v/' + config.devVersion + '/static/js/min/';
|
||||||
config.paths.staticCSS = 'snappymail/v/' + config.devVersion + '/static/css/';
|
config.paths.staticCSS = 'snappymail/v/' + config.devVersion + '/static/css/';
|
||||||
|
|
||||||
config.paths.assets = {
|
|
||||||
src: ['assets/**/*.*', 'assets/**/.htaccess']
|
|
||||||
};
|
|
||||||
|
|
||||||
config.paths.less = {
|
config.paths.less = {
|
||||||
main: {
|
main: {
|
||||||
src: 'dev/Styles/@Main.less',
|
src: 'dev/Styles/@Main.less',
|
||||||
|
|