Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[embed] fix bug 53324

Browse source
This commit is contained in:
Maxim Kadushkin 2021-10-25 00:32:35 +03:00
parent 116b4e15ab
commit fb3599293b
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/embed/resources/less/common.less
View file

@ -239,7 +239,7 @@
display: block; display: block;
width: 100px; width: 100px;
height: 24px; height: 24px;
background: data-uri('../../../../common/embed/resources/img/logo.svg') no-repeat; background: url(../../../../common/embed/resources/img/logo.svg) no-repeat;
} }
// Control buttons // Control buttons

2
build/Gruntfile.js
View file

@ -252,6 +252,7 @@ module.exports = function(grunt) {
doRegisterTask('es6-promise'); doRegisterTask('es6-promise');
doRegisterTask('jszip'); doRegisterTask('jszip');
doRegisterTask('jsziputils'); doRegisterTask('jsziputils');
doRegisterTask('common-embed');
doRegisterTask('requirejs', function(defaultConfig, packageFile) { doRegisterTask('requirejs', function(defaultConfig, packageFile) {
return { return {
uglify: { uglify: {
@ -622,6 +623,7 @@ module.exports = function(grunt) {
grunt.registerTask('deploy-jsziputils', ['jsziputils-init', 'clean', 'copy']); grunt.registerTask('deploy-jsziputils', ['jsziputils-init', 'clean', 'copy']);
grunt.registerTask('deploy-requirejs', ['requirejs-init', 'clean', 'uglify']); grunt.registerTask('deploy-requirejs', ['requirejs-init', 'clean', 'uglify']);
grunt.registerTask('deploy-es6-promise', ['es6-promise-init', 'clean', 'copy']); grunt.registerTask('deploy-es6-promise', ['es6-promise-init', 'clean', 'copy']);
grunt.registerTask('deploy-common-embed', ['common-embed-init', 'clean', 'copy']);
grunt.registerTask('deploy-app-main', ['prebuild-icons-sprite', 'main-app-init', 'clean:prebuild', 'imagemin', 'less', grunt.registerTask('deploy-app-main', ['prebuild-icons-sprite', 'main-app-init', 'clean:prebuild', 'imagemin', 'less',
'requirejs', 'concat', 'copy', 'svgmin', 'inline', 'json-minify', 'requirejs', 'concat', 'copy', 'svgmin', 'inline', 'json-minify',

14
build/common.json
View file

@ -227,6 +227,17 @@
"dest": "../deploy/web-apps/vendor/requirejs/require.js" "dest": "../deploy/web-apps/vendor/requirejs/require.js"
} }
}, },
"common-embed": {
"clean": [
"../deploy/web-apps/apps/common/embed"
],
"copy": {
"app-logo": {
"dest": "../deploy/web-apps/apps/common/embed/resources/img/logo.svg",
"src": "../apps/common/embed/resources/img/logo.svg"
}
}
},
"tasks": { "tasks": {
"deploy": [ "deploy": [
"increment-build", "increment-build",
@ -243,7 +254,8 @@
"deploy-fetch", "deploy-fetch",
"deploy-jszip", "deploy-jszip",
"deploy-jsziputils", "deploy-jsziputils",
"deploy-es6-promise" "deploy-es6-promise",
"deploy-common-embed"
] ]
} }
} }