diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 78de4301eb..0f86866d6a 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -876,7 +876,7 @@ define([ this.logo.addClass('hidden'); } else if (this.branding.logo.image || this.branding.logo.imageDark || this.branding.logo.imageLight) { _logoImage = logo.image; - this.logo.html(''); + this.logo.html(''); this.logo.css({'background-image': 'none', width: 'auto'}); (this.branding.logo.url || this.branding.logo.url===undefined) && this.logo.addClass('link'); } @@ -1111,7 +1111,7 @@ define([ element.addClass('hidden'); } else if (value.logo.image || value.logo.imageDark || value.logo.imageLight) { _logoImage = logo.image; - element.html(''); + element.html(''); element.css({'background-image': 'none', width: 'auto'}); (value.logo.url || value.logo.url===undefined) && element.addClass('link'); } diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 82440c4f23..1e951e5cb3 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -165,7 +165,7 @@ } #header-logo { - max-width: 200px; + //max-width: 200px; height: 100%; padding: 6px 24px 6px 12px; .rtl & { diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index d16b6e2dfa..406d103188 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -989,7 +989,7 @@ DE.ApplicationController = new(function(){ } if (value.logo.image || value.logo.imageEmbedded) { - logo.html(''); + logo.html(''); logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); value.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead."); diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index ffb062392f..8bc5f83468 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -899,7 +899,7 @@ define([ if (value.logo.image || value.logo.imageDark || value.logo.imageLight) { _logoImage = Common.UI.Themes.isDarkTheme() ? (value.logo.imageDark || value.logo.image || value.logo.imageLight) : (value.logo.imageLight || value.logo.image || value.logo.imageDark); - logo.html(''); + logo.html(''); logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); } diff --git a/apps/pdfeditor/main/app/view/FormatSettingsDialog.js b/apps/pdfeditor/main/app/view/FormatSettingsDialog.js index 0897e338cf..0e0c69df39 100644 --- a/apps/pdfeditor/main/app/view/FormatSettingsDialog.js +++ b/apps/pdfeditor/main/app/view/FormatSettingsDialog.js @@ -255,6 +255,7 @@ define([ validateOnChange : true, validation : function () { return true; } }).on ('changing', function (input, value) { + me._state.DateFormat = value; me.lblExample.text(me.api.asc_getFieldDateTimeFormatExample(value)); }); diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index a3a89cc131..b60febfa0a 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -829,7 +829,7 @@ PE.ApplicationController = new(function(){ } if (value.logo.image || value.logo.imageEmbedded) { - logo.html(''); + logo.html(''); logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); value.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead."); diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index c0e49225b5..e0b81a1f36 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -922,7 +922,7 @@ SSE.ApplicationController = new(function(){ } if (value.logo.image || value.logo.imageEmbedded) { - logo.html(''); + logo.html(''); logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); value.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead."); diff --git a/apps/visioeditor/embed/js/ApplicationController.js b/apps/visioeditor/embed/js/ApplicationController.js index 3bbd9a3177..b9ec54fc4e 100644 --- a/apps/visioeditor/embed/js/ApplicationController.js +++ b/apps/visioeditor/embed/js/ApplicationController.js @@ -872,7 +872,7 @@ VE.ApplicationController = new(function(){ } if (value.logo.image || value.logo.imageEmbedded) { - logo.html(''); + logo.html(''); logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); value.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");