diff --git a/apps/common/mobile/resources/less/about.less b/apps/common/mobile/resources/less/about.less index 8a7559530..3072fb575 100644 --- a/apps/common/mobile/resources/less/about.less +++ b/apps/common/mobile/resources/less/about.less @@ -1,4 +1,5 @@ @text-normal: #000; +// @common-image-about-path - defined in webpack config .about { .page-content { @@ -36,6 +37,6 @@ display: inline-block; width: 100%; height: 55px; - background: url('../../../../common/main/resources/img/about/logo_s.svg') no-repeat center; + background: ~"url(@{common-image-about-path}/logo_s.svg) no-repeat center"; } } diff --git a/apps/common/mobile/resources/less/ios/icons.less b/apps/common/mobile/resources/less/ios/icons.less index 4339dc06a..401956832 100644 --- a/apps/common/mobile/resources/less/ios/icons.less +++ b/apps/common/mobile/resources/less/ios/icons.less @@ -1,3 +1,5 @@ +// @common-image-header-path - defined in webpack config + .device-ios { i.icon { &.icon_mask { @@ -6,7 +8,7 @@ &.icon-logo { width: 100px; height: 14px; - background: url('../../img/header/logo-ios.svg') no-repeat center; + background: ~"url(@{common-image-header-path}/logo-ios.svg)" no-repeat center; } &.icon-prev { width: 22px; diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less index ffc52be05..53577e587 100644 --- a/apps/common/mobile/resources/less/material/icons.less +++ b/apps/common/mobile/resources/less/material/icons.less @@ -1,3 +1,5 @@ +// @common-image-header-path - defined in webpack config + .device-android { i.icon { &.icon_mask { @@ -6,7 +8,7 @@ &.icon-logo { width: 100px; height: 14px; - background: url('../../img/header/logo-android.svg') no-repeat center; + background: ~"url(@{common-image-header-path}/logo-android.svg) no-repeat center"; } &.icon-prev { width: 20px; diff --git a/build/documenteditor.json b/build/documenteditor.json index 9f20bf075..6158c01bb 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -293,6 +293,12 @@ "cwd": "../apps/common/mobile/resources/img/", "src": "**", "dest": "../deploy/web-apps/apps/documenteditor/mobile/resources/img/" + }, + { + "expand": true, + "cwd": "../apps/common/main/resources/img/about", + "src": "**", + "dest": "../deploy/web-apps/apps/documenteditor/mobile/resources/img/about" } ], "assets": [ diff --git a/build/presentationeditor.json b/build/presentationeditor.json index 9e5961a4a..4d2ebeee0 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -309,6 +309,12 @@ "cwd": "../apps/common/mobile/resources/img/", "src": "**", "dest": "../deploy/web-apps/apps/presentationeditor/mobile/resources/img/" + }, + { + "expand": true, + "cwd": "../apps/common/main/resources/img/about", + "src": "**", + "dest": "../deploy/web-apps/apps/presentationeditor/mobile/resources/img/about" } ] } diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 784cea7d4..c0b8bddb8 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -319,7 +319,13 @@ "images-common": [ { "expand": true, - "cwd": "../apps/common/mobile/resources/img/about", + "cwd": "../apps/common/mobile/resources/img/", + "src": "**", + "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/img/" + }, + { + "expand": true, + "cwd": "../apps/common/main/resources/img/about", "src": "**", "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/img/about" } @@ -369,7 +375,7 @@ "index-page": { "../deploy/web-apps/apps/spreadsheeteditor/embed/index.html": "../apps/spreadsheeteditor/embed/index.html.deploy", "../deploy/web-apps/apps/spreadsheeteditor/embed/index_loader.html": "../apps/spreadsheeteditor/embed/index_loader.html.deploy" - }, + }, "images-app": [ { "expand": true, diff --git a/vendor/framework7-react/build/webpack.config.js b/vendor/framework7-react/build/webpack.config.js index 359731620..66f9eb5ca 100644 --- a/vendor/framework7-react/build/webpack.config.js +++ b/vendor/framework7-react/build/webpack.config.js @@ -116,7 +116,7 @@ module.exports = { publicPath: '../' } }), - 'css-loader', + 'css-loader?url=false', { loader: 'postcss-loader', options: { @@ -129,7 +129,11 @@ module.exports = { loader: "less-loader", options: { lessOptions: { - javascriptEnabled: true + javascriptEnabled: true, + globalVars: { + "common-image-header-path": env === 'production' ? `../../../${editor}/mobile/resources/img/header` : '../../common/mobile/resources/img/header', + "common-image-about-path": env === 'production' ? `../../../${editor}/mobile/resources/img/about` : '../../common/main/resources/img/about', + } } } },