From c754b4dd53d8b14cb035e62d149ae2b81706da1d Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 16 Jan 2020 11:08:38 +0300 Subject: [PATCH] [mobile] Add logo --- .../mobile/app/controller/Main.js | 5 +++++ .../mobile/app/template/Editor.template | 2 +- .../mobile/app/template/Toolbar.template | 3 ++- apps/documenteditor/mobile/app/view/Search.js | 5 +++++ apps/documenteditor/mobile/index.html | 14 +++++++++++--- apps/documenteditor/mobile/index.html.deploy | 14 +++++++++++--- .../mobile/resources/css/app-ios.css | 15 +++++++++++++++ .../mobile/resources/css/app-material.css | 15 +++++++++++++++ .../mobile/resources/less/app-ios.less | 11 +++++++++++ .../mobile/resources/less/app-material.less | 11 +++++++++++ .../mobile/resources/less/ios/_icons.less | 5 +++++ .../mobile/resources/less/material/_icons.less | 5 +++++ .../mobile/app/controller/Main.js | 6 ++++++ .../mobile/app/template/Editor.template | 2 +- .../mobile/app/template/Toolbar.template | 3 ++- .../mobile/app/view/Search.js | 5 +++++ apps/presentationeditor/mobile/index.html | 8 ++++---- .../mobile/index.html.deploy | 8 ++++---- .../mobile/resources/css/app-ios.css | 15 +++++++++++++++ .../mobile/resources/css/app-material.css | 15 +++++++++++++++ .../mobile/resources/less/app-ios.less | 12 ++++++++++++ .../mobile/resources/less/app-material.less | 12 ++++++++++++ .../mobile/resources/less/ios/_icons.less | 5 +++++ .../mobile/resources/less/material/_icons.less | 5 +++++ .../mobile/app/controller/Main.js | 6 ++++++ .../mobile/app/template/Editor.template | 2 +- .../mobile/app/template/Toolbar.template | 3 ++- .../mobile/app/view/Search.js | 5 +++++ apps/spreadsheeteditor/mobile/index.html | 8 ++++---- .../spreadsheeteditor/mobile/index.html.deploy | 8 ++++---- .../mobile/resources/css/app-ios.css | 18 ++++++++++++++++++ .../mobile/resources/css/app-material.css | 18 ++++++++++++++++++ .../mobile/resources/less/app-ios.less | 14 ++++++++++++++ .../mobile/resources/less/app-material.less | 15 +++++++++++++++ .../mobile/resources/less/ios/_icons.less | 5 +++++ .../mobile/resources/less/material/_icons.less | 5 +++++ 36 files changed, 280 insertions(+), 28 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 835009461..73627b547 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -773,6 +773,11 @@ define([ me.hidePreloader(); me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); } + if (me.appOptions.canBrandingExt && (me.editorConfig.customization && (me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo))) { + $('#editor-navbar #navbar-logo').hide(); + $('#editor-navbar').removeClass('logo-navbar'); + $('#editor_sdk').removeClass('with-logo'); + } }, applyModeCommonElements: function() { diff --git a/apps/documenteditor/mobile/app/template/Editor.template b/apps/documenteditor/mobile/app/template/Editor.template index 5c1c00857..9af8c3e02 100644 --- a/apps/documenteditor/mobile/app/template/Editor.template +++ b/apps/documenteditor/mobile/app/template/Editor.template @@ -2,7 +2,7 @@
diff --git a/apps/documenteditor/mobile/app/template/Toolbar.template b/apps/documenteditor/mobile/app/template/Toolbar.template index a1238415a..9cb6d2657 100644 --- a/apps/documenteditor/mobile/app/template/Toolbar.template +++ b/apps/documenteditor/mobile/app/template/Toolbar.template @@ -1,4 +1,5 @@ -