diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
index 41f151f155..f6133e032c 100644
--- a/apps/api/documents/api.js
+++ b/apps/api/documents/api.js
@@ -105,7 +105,7 @@
customization: {
logo: {
image: url,
- imageEmbedded: url,
+ imageEmbedded: url, // deprecated, use image instead
url: http://...
},
customer: {
@@ -918,8 +918,8 @@
if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) {
if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + encodeURIComponent(config.editorConfig.customization.loaderLogo);
} else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) {
- if (config.type=='embedded' && config.editorConfig.customization.logo.imageEmbedded)
- params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.imageEmbedded);
+ if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded))
+ params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded);
else if (config.type!='embedded' && config.editorConfig.customization.logo.image)
params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image);
}
diff --git a/apps/common/embed/resources/img/logo.svg b/apps/common/embed/resources/img/logo.svg
index 0d3cb18e7e..4de1b67a57 100644
--- a/apps/common/embed/resources/img/logo.svg
+++ b/apps/common/embed/resources/img/logo.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/apps/common/embed/resources/less/common.less b/apps/common/embed/resources/less/common.less
index 7cb7864489..1f0d4e378a 100644
--- a/apps/common/embed/resources/less/common.less
+++ b/apps/common/embed/resources/less/common.less
@@ -238,7 +238,7 @@
.brand-logo {
display: block;
width: 100px;
- height: 24px;
+ height: 20px;
background: data-uri('../../../../common/embed/resources/img/logo.svg') no-repeat;
}
diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html
index 32a421a62a..7355d87dd7 100644
--- a/apps/documenteditor/embed/index.html
+++ b/apps/documenteditor/embed/index.html
@@ -43,14 +43,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
- height: 24px;
+ height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
- max-width: 124px;
+ max-width: 100px;
max-height: 20px;
opacity: 0;
}
diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy
index d06ee816ab..527732ad99 100644
--- a/apps/documenteditor/embed/index.html.deploy
+++ b/apps/documenteditor/embed/index.html.deploy
@@ -41,14 +41,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
- height: 24px;
+ height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
- max-width: 124px;
+ max-width: 100px;
max-height: 20px;
opacity: 0;
}
diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js
index f3b577b53b..b2a3150fc4 100644
--- a/apps/documenteditor/embed/js/ApplicationController.js
+++ b/apps/documenteditor/embed/js/ApplicationController.js
@@ -599,9 +599,11 @@ DE.ApplicationController = new(function(){
config.customization && config.customization.logo ) {
var logo = $('#header-logo');
- if (config.customization.logo.imageEmbedded) {
- logo.html('
');
+ if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
+ logo.html('+')
');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
+
+ config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
}
if (config.customization.logo.url) {
diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html
index d94d7b7654..c16fd838f4 100644
--- a/apps/presentationeditor/embed/index.html
+++ b/apps/presentationeditor/embed/index.html
@@ -43,14 +43,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
- height: 24px;
+ height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
- max-width: 124px;
+ max-width: 100px;
max-height: 20px;
opacity: 0;
}
diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy
index 6bfce4d25f..540856471e 100644
--- a/apps/presentationeditor/embed/index.html.deploy
+++ b/apps/presentationeditor/embed/index.html.deploy
@@ -41,14 +41,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
- height: 24px;
+ height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
- max-width: 124px;
+ max-width: 100px;
max-height: 20px;
opacity: 0;
}
diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js
index 8317bc3f29..766dba5fd7 100644
--- a/apps/presentationeditor/embed/js/ApplicationController.js
+++ b/apps/presentationeditor/embed/js/ApplicationController.js
@@ -457,9 +457,11 @@ PE.ApplicationController = new(function(){
config.customization && config.customization.logo ) {
var logo = $('#header-logo');
- if (config.customization.logo.imageEmbedded) {
- logo.html('');
+ if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
+ logo.html('');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
+
+ config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
}
if (config.customization.logo.url) {
diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html
index 12f2e04874..2e0f4617cd 100644
--- a/apps/spreadsheeteditor/embed/index.html
+++ b/apps/spreadsheeteditor/embed/index.html
@@ -43,14 +43,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
- height: 24px;
+ height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
- max-width: 124px;
+ max-width: 100px;
max-height: 20px;
opacity: 0;
}
diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy
index 59dd5d1131..5bced543e7 100644
--- a/apps/spreadsheeteditor/embed/index.html.deploy
+++ b/apps/spreadsheeteditor/embed/index.html.deploy
@@ -40,14 +40,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
- height: 24px;
+ height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
- max-width: 124px;
+ max-width: 100px;
max-height: 20px;
opacity: 0;
}
diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js
index 0bfa8b6d61..68d8687a21 100644
--- a/apps/spreadsheeteditor/embed/js/ApplicationController.js
+++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js
@@ -353,9 +353,11 @@ SSE.ApplicationController = new(function(){
config.customization && config.customization.logo ) {
var logo = $('#header-logo');
- if (config.customization.logo.imageEmbedded) {
- logo.html('');
+ if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
+ logo.html('');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
+
+ config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
}
if (config.customization.logo.url) {