[mobile] for bug 53253

This commit is contained in:
Maxim Kadushkin 2021-10-22 23:03:03 +03:00
parent 690867b159
commit ec46276bea
7 changed files with 34 additions and 7 deletions

View file

@ -1,4 +1,5 @@
@text-normal: #000; @text-normal: #000;
// @common-image-about-path - defined in webpack config
.about { .about {
.page-content { .page-content {
@ -36,6 +37,6 @@
display: inline-block; display: inline-block;
width: 100%; width: 100%;
height: 55px; 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";
} }
} }

View file

@ -1,3 +1,5 @@
// @common-image-header-path - defined in webpack config
.device-ios { .device-ios {
i.icon { i.icon {
&.icon_mask { &.icon_mask {
@ -6,7 +8,7 @@
&.icon-logo { &.icon-logo {
width: 100px; width: 100px;
height: 14px; 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 { &.icon-prev {
width: 22px; width: 22px;

View file

@ -1,3 +1,5 @@
// @common-image-header-path - defined in webpack config
.device-android { .device-android {
i.icon { i.icon {
&.icon_mask { &.icon_mask {
@ -6,7 +8,7 @@
&.icon-logo { &.icon-logo {
width: 100px; width: 100px;
height: 14px; 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 { &.icon-prev {
width: 20px; width: 20px;

View file

@ -293,6 +293,12 @@
"cwd": "../apps/common/mobile/resources/img/", "cwd": "../apps/common/mobile/resources/img/",
"src": "**", "src": "**",
"dest": "../deploy/web-apps/apps/documenteditor/mobile/resources/img/" "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": [ "assets": [

View file

@ -309,6 +309,12 @@
"cwd": "../apps/common/mobile/resources/img/", "cwd": "../apps/common/mobile/resources/img/",
"src": "**", "src": "**",
"dest": "../deploy/web-apps/apps/presentationeditor/mobile/resources/img/" "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"
} }
] ]
} }

View file

@ -319,7 +319,13 @@
"images-common": [ "images-common": [
{ {
"expand": true, "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": "**", "src": "**",
"dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/img/about" "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/img/about"
} }
@ -369,7 +375,7 @@
"index-page": { "index-page": {
"../deploy/web-apps/apps/spreadsheeteditor/embed/index.html": "../apps/spreadsheeteditor/embed/index.html.deploy", "../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" "../deploy/web-apps/apps/spreadsheeteditor/embed/index_loader.html": "../apps/spreadsheeteditor/embed/index_loader.html.deploy"
}, },
"images-app": [ "images-app": [
{ {
"expand": true, "expand": true,

View file

@ -116,7 +116,7 @@ module.exports = {
publicPath: '../' publicPath: '../'
} }
}), }),
'css-loader', 'css-loader?url=false',
{ {
loader: 'postcss-loader', loader: 'postcss-loader',
options: { options: {
@ -129,7 +129,11 @@ module.exports = {
loader: "less-loader", loader: "less-loader",
options: { options: {
lessOptions: { 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',
}
} }
} }
}, },