From 1cff575fd6f7939375e0ea16875ece6c17f0a1c6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 26 Jul 2019 12:54:20 +0300 Subject: [PATCH 01/69] Add onRequestSaveAs event --- apps/api/documents/api.js | 1 + apps/common/Gateway.js | 10 ++++ .../main/app/controller/LeftMenu.js | 46 ++++++++++--------- .../main/app/controller/Main.js | 1 + apps/documenteditor/main/app/view/FileMenu.js | 4 +- .../main/app/controller/LeftMenu.js | 46 ++++++++++--------- .../main/app/controller/Main.js | 1 + .../main/app/view/FileMenu.js | 12 +++-- .../main/app/controller/LeftMenu.js | 46 ++++++++++--------- .../main/app/controller/Main.js | 1 + .../main/app/view/FileMenu.js | 12 +++-- 11 files changed, 109 insertions(+), 71 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 50848e08f..455f8d4d7 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -202,6 +202,7 @@ _config.editorConfig.canRequestUsers = _config.events && !!_config.events.onRequestUsers; _config.editorConfig.canRequestSendNotify = _config.events && !!_config.events.onRequestSendNotify; _config.editorConfig.mergeFolderUrl = _config.editorConfig.mergeFolderUrl || _config.editorConfig.saveAsUrl; + _config.editorConfig.canRequestSaveAs = _config.events && !!_config.events.onRequestSaveAs; _config.frameEditorId = placeholderId; _config.events && !!_config.events.onReady && console.log("Obsolete: The onReady event is deprecated. Please use onAppReady instead."); diff --git a/apps/common/Gateway.js b/apps/common/Gateway.js index 373c41e58..53c0b1e65 100644 --- a/apps/common/Gateway.js +++ b/apps/common/Gateway.js @@ -250,6 +250,16 @@ if (Common === undefined) { }); }, + requestSaveAs: function(url, title) { + _postMessage({ + event: 'onRequestSaveAs', + data: { + url: url, + title: title + } + }); + }, + collaborativeChanges: function() { _postMessage({event: 'onCollaborativeChanges'}); }, diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index e5089cf80..e361dca68 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -400,27 +400,31 @@ define([ defFileName = defFileName.substring(0, idx) + this.isFromFileDownloadAs; } - me._saveCopyDlg = new Common.Views.SaveAsDlg({ - saveFolderUrl: me.mode.saveAsUrl, - saveFileUrl: url, - defFileName: defFileName - }); - me._saveCopyDlg.on('saveaserror', function(obj, err){ - var config = { - closable: false, - title: me.notcriticalErrorTitle, - msg: err, - iconCls: 'warn', - buttons: ['ok'], - callback: function(btn){ - Common.NotificationCenter.trigger('edit:complete', me); - } - }; - Common.UI.alert(config); - }).on('close', function(obj){ - me._saveCopyDlg = undefined; - }); - me._saveCopyDlg.show(); + if (me.mode.canRequestSaveAs) { + Common.Gateway.requestSaveAs(url, defFileName); + } else { + me._saveCopyDlg = new Common.Views.SaveAsDlg({ + saveFolderUrl: me.mode.saveAsUrl, + saveFileUrl: url, + defFileName: defFileName + }); + me._saveCopyDlg.on('saveaserror', function(obj, err){ + var config = { + closable: false, + title: me.notcriticalErrorTitle, + msg: err, + iconCls: 'warn', + buttons: ['ok'], + callback: function(btn){ + Common.NotificationCenter.trigger('edit:complete', me); + } + }; + Common.UI.alert(config); + }).on('close', function(obj){ + me._saveCopyDlg = undefined; + }); + me._saveCopyDlg.show(); + } } this.isFromFileDownloadAs = false; }, diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index ebcb64a20..b02214660 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -349,6 +349,7 @@ define([ this.appOptions.canMakeActionLink = this.editorConfig.canMakeActionLink; this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers; this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify; + this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs; appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header'); appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '') diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js index 42b20e6ba..ef6aa6879 100644 --- a/apps/documenteditor/main/app/view/FileMenu.js +++ b/apps/documenteditor/main/app/view/FileMenu.js @@ -259,7 +259,7 @@ define([ this.miNew.$el.find('+.devider')[this.mode.canCreateNew?'show':'hide'](); this.miDownload[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide'](); - this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && this.mode.saveAsUrl ?'show':'hide'](); + this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide'](); this.miSaveAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide'](); // this.hkSaveAs[this.mode.canDownload?'enable':'disable'](); @@ -306,7 +306,7 @@ define([ } else if (this.mode.canDownloadOrigin) $('a',this.miDownload.$el).text(this.textDownload); - if (this.mode.canDownload && this.mode.saveAsUrl) { + if (this.mode.canDownload && (this.mode.canRequestSaveAs || this.mode.saveAsUrl)) { this.panels['save-copy'] = ((new DE.Views.FileMenuPanels.ViewSaveCopy({menu: this})).render()); } diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index c206574d2..1b65c7a0f 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -269,27 +269,31 @@ define([ defFileName = defFileName.substring(0, idx) + this.isFromFileDownloadAs; } - me._saveCopyDlg = new Common.Views.SaveAsDlg({ - saveFolderUrl: me.mode.saveAsUrl, - saveFileUrl: url, - defFileName: defFileName - }); - me._saveCopyDlg.on('saveaserror', function(obj, err){ - var config = { - closable: false, - title: me.notcriticalErrorTitle, - msg: err, - iconCls: 'warn', - buttons: ['ok'], - callback: function(btn){ - Common.NotificationCenter.trigger('edit:complete', me); - } - }; - Common.UI.alert(config); - }).on('close', function(obj){ - me._saveCopyDlg = undefined; - }); - me._saveCopyDlg.show(); + if (me.mode.canRequestSaveAs) { + Common.Gateway.requestSaveAs(url, defFileName); + } else { + me._saveCopyDlg = new Common.Views.SaveAsDlg({ + saveFolderUrl: me.mode.saveAsUrl, + saveFileUrl: url, + defFileName: defFileName + }); + me._saveCopyDlg.on('saveaserror', function(obj, err){ + var config = { + closable: false, + title: me.notcriticalErrorTitle, + msg: err, + iconCls: 'warn', + buttons: ['ok'], + callback: function(btn){ + Common.NotificationCenter.trigger('edit:complete', me); + } + }; + Common.UI.alert(config); + }).on('close', function(obj){ + me._saveCopyDlg = undefined; + }); + me._saveCopyDlg.show(); + } } this.isFromFileDownloadAs = false; }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 926f0962d..8cde163ce 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -316,6 +316,7 @@ define([ this.appOptions.canPlugins = false; this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers; this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify; + this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs; appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header'); appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '') diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js index 4cc11dc79..3a7fa0803 100644 --- a/apps/presentationeditor/main/app/view/FileMenu.js +++ b/apps/presentationeditor/main/app/view/FileMenu.js @@ -214,8 +214,6 @@ define([ var me = this; me.panels = { - 'saveas' : (new PE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(), - 'save-copy' : (new PE.Views.FileMenuPanels.ViewSaveCopy({menu:me})).render(), 'opts' : (new PE.Views.FileMenuPanels.Settings({menu:me})).render(), 'info' : (new PE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(), 'rights' : (new PE.Views.FileMenuPanels.DocumentRights({menu:me})).render() @@ -256,7 +254,7 @@ define([ this.miNew.$el.find('+.devider')[this.mode.canCreateNew?'show':'hide'](); this.miDownload[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide'](); - this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && this.mode.saveAsUrl ?'show':'hide'](); + this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide'](); this.miSaveAs[(this.mode.canDownload && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide'](); // this.hkSaveAs[this.mode.canDownload?'enable':'disable'](); @@ -297,6 +295,14 @@ define([ this.panels['protect'].setMode(this.mode); } + if (this.mode.canDownload) { + this.panels['saveas'] = ((new PE.Views.FileMenuPanels.ViewSaveAs({menu: this})).render()); + } + + if (this.mode.canDownload && (this.mode.canRequestSaveAs || this.mode.saveAsUrl)) { + this.panels['save-copy'] = ((new PE.Views.FileMenuPanels.ViewSaveCopy({menu: this})).render()); + } + if (this.mode.canHelp) { this.panels['help'] = ((new PE.Views.FileMenuPanels.Help({menu: this})).render()); this.panels['help'].setLangConfig(this.mode.lang); diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 6c6bd98de..4667170d1 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -315,27 +315,31 @@ define([ defFileName = defFileName.substring(0, idx) + this.isFromFileDownloadAs; } - me._saveCopyDlg = new Common.Views.SaveAsDlg({ - saveFolderUrl: me.mode.saveAsUrl, - saveFileUrl: url, - defFileName: defFileName - }); - me._saveCopyDlg.on('saveaserror', function(obj, err){ - var config = { - closable: false, - title: me.textWarning, - msg: err, - iconCls: 'warn', - buttons: ['ok'], - callback: function(btn){ - Common.NotificationCenter.trigger('edit:complete', me); - } - }; - Common.UI.alert(config); - }).on('close', function(obj){ - me._saveCopyDlg = undefined; - }); - me._saveCopyDlg.show(); + if (me.mode.canRequestSaveAs) { + Common.Gateway.requestSaveAs(url, defFileName); + } else { + me._saveCopyDlg = new Common.Views.SaveAsDlg({ + saveFolderUrl: me.mode.saveAsUrl, + saveFileUrl: url, + defFileName: defFileName + }); + me._saveCopyDlg.on('saveaserror', function(obj, err){ + var config = { + closable: false, + title: me.textWarning, + msg: err, + iconCls: 'warn', + buttons: ['ok'], + callback: function(btn){ + Common.NotificationCenter.trigger('edit:complete', me); + } + }; + Common.UI.alert(config); + }).on('close', function(obj){ + me._saveCopyDlg = undefined; + }); + me._saveCopyDlg.show(); + } } this.isFromFileDownloadAs = false; }, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 24bb00796..c8be815d9 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -322,6 +322,7 @@ define([ this.appOptions.canPlugins = false; this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers; this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify; + this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs; this.headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header'); this.headerView.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '') diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js index b4600ab43..722d725c1 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenu.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenu.js @@ -203,8 +203,6 @@ define([ var me = this; me.panels = { - 'saveas' : (new SSE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(), - 'save-copy' : (new SSE.Views.FileMenuPanels.ViewSaveCopy({menu:me})).render(), 'opts' : (new SSE.Views.FileMenuPanels.Settings({menu:me})).render(), 'info' : (new SSE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(), 'rights' : (new SSE.Views.FileMenuPanels.DocumentRights({menu:me})).render() @@ -245,7 +243,7 @@ define([ this.miNew.$el.find('+.devider')[this.mode.canCreateNew?'show':'hide'](); this.miDownload[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide'](); - this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && this.mode.saveAsUrl ?'show':'hide'](); + this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide'](); this.miSaveAs[(this.mode.canDownload && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide'](); // this.hkSaveAs[this.mode.canDownload?'enable':'disable'](); @@ -288,6 +286,14 @@ define([ this.panels['protect'].setMode(this.mode); } + if (this.mode.canDownload) { + this.panels['saveas'] = ((new SSE.Views.FileMenuPanels.ViewSaveAs({menu: this})).render()); + } + + if (this.mode.canDownload && (this.mode.canRequestSaveAs || this.mode.saveAsUrl)) { + this.panels['save-copy'] = ((new SSE.Views.FileMenuPanels.ViewSaveCopy({menu: this})).render()); + } + if (this.mode.canHelp) { this.panels['help'] = ((new SSE.Views.FileMenuPanels.Help({menu: this})).render()); this.panels['help'].setLangConfig(this.mode.lang); From b9917f6dff3f176d11572be78ec29d5a7ad0d2a8 Mon Sep 17 00:00:00 2001 From: Sergey Konovalov Date: Fri, 26 Jul 2019 13:46:26 +0300 Subject: [PATCH 02/69] [SSE] Add DataValidation.js --- apps/spreadsheeteditor/sdk_dev_scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index 5030f05ec..d0dd559be 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -110,6 +110,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/cell/model/Workbook.js", "../../../../sdkjs/cell/model/Serialize.js", "../../../../sdkjs/cell/model/ConditionalFormatting.js", + "../../../../sdkjs/cell/model/DataValidation.js", "../../../../sdkjs/cell/model/CellInfo.js", "../../../../sdkjs/cell/view/mobileTouch.js", "../../../../sdkjs/cell/view/StringRender.js", From d45d04f0a1a8c2b1c0da19151c8ec894571e8cb4 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 26 Jul 2019 14:49:53 +0300 Subject: [PATCH 03/69] Add onRequestInsertImage event, insertImage method for inserting image from storage --- apps/api/documents/api.js | 11 +++++++- apps/common/Gateway.js | 8 ++++++ .../main/app/controller/Main.js | 1 + .../main/app/controller/Toolbar.js | 25 +++++++++++++----- .../main/app/controller/Main.js | 1 + .../main/app/controller/Toolbar.js | 25 +++++++++++++----- .../main/app/controller/Main.js | 1 + .../main/app/controller/Toolbar.js | 26 +++++++++++++------ 8 files changed, 75 insertions(+), 23 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 455f8d4d7..a3cff0e83 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -203,6 +203,7 @@ _config.editorConfig.canRequestSendNotify = _config.events && !!_config.events.onRequestSendNotify; _config.editorConfig.mergeFolderUrl = _config.editorConfig.mergeFolderUrl || _config.editorConfig.saveAsUrl; _config.editorConfig.canRequestSaveAs = _config.events && !!_config.events.onRequestSaveAs; + _config.editorConfig.canRequestInsertImage = _config.events && !!_config.events.onRequestInsertImage; _config.frameEditorId = placeholderId; _config.events && !!_config.events.onReady && console.log("Obsolete: The onReady event is deprecated. Please use onAppReady instead."); @@ -561,6 +562,13 @@ }); }; + var _insertImage = function(data) { + _sendCommand({ + command: 'insertImage', + data: data + }); + }; + var _processMouse = function(evt) { var r = iframe.getBoundingClientRect(); var data = { @@ -603,7 +611,8 @@ destroyEditor : _destroyEditor, setUsers : _setUsers, showSharingSettings : _showSharingSettings, - setSharingSettings : _setSharingSettings + setSharingSettings : _setSharingSettings, + insertImage : _insertImage } }; diff --git a/apps/common/Gateway.js b/apps/common/Gateway.js index 53c0b1e65..5ba1710a2 100644 --- a/apps/common/Gateway.js +++ b/apps/common/Gateway.js @@ -110,6 +110,10 @@ if (Common === undefined) { 'setSharingSettings': function(data) { $me.trigger('setsharingsettings', data); + }, + + 'insertImage': function(data) { + $me.trigger('insertimage', data); } }; @@ -292,6 +296,10 @@ if (Common === undefined) { _postMessage({event:'onRequestSendNotify', data: emails}) }, + requestInsertImage: function () { + _postMessage({event:'onRequestInsertImage'}) + }, + on: function(event, handler){ var localHandler = function(event, data){ handler.call(me, data) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index b02214660..eacd8804f 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -350,6 +350,7 @@ define([ this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers; this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify; this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs; + this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage; appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header'); appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '') diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 38d4f5857..2c33652e4 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -323,6 +323,7 @@ define([ toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this)); toolbar.mnuNoControlsColor.on('click', _.bind(this.onNoControlsColor, this)); toolbar.mnuControlsColorPicker.on('select', _.bind(this.onSelectControlsColor, this)); + Common.Gateway.on('insertimage', _.bind(this.insertImage, this)); $('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this)); $('#id-save-style-plus, #id-save-style-link', toolbar.$el).on('click', this.onMenuSaveStyle.bind(this)); @@ -1427,13 +1428,23 @@ define([ } })).show(); } else if (item.value === 'storage') { - (new Common.Views.SelectFileDlg({ - fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") - })).on('selectfile', function(obj, file){ - me.toolbar.fireEvent('insertimage', me.toolbar); - me.api.AddImageUrl(file.url, undefined, true);// for loading from storage - Common.component.Analytics.trackEvent('ToolBar', 'Image'); - }).show(); + if (this.toolbar.mode.canRequestInsertImage) { + Common.Gateway.requestInsertImage(); + } else { + (new Common.Views.SelectFileDlg({ + fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") + })).on('selectfile', function(obj, file){ + me.insertImage(file); + }).show(); + } + } + }, + + insertImage: function(data) { + if (data && data.url) { + this.toolbar.fireEvent('insertimage', this.toolbar); + this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage + Common.component.Analytics.trackEvent('ToolBar', 'Image'); } }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 8cde163ce..eadff86e7 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -317,6 +317,7 @@ define([ this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers; this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify; this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs; + this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage; appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header'); appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '') diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 4d32a2ae5..c2563c927 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -314,6 +314,7 @@ define([ toolbar.btnEditHeader.on('click', _.bind(this.onEditHeaderClick, this, 'header')); toolbar.btnInsDateTime.on('click', _.bind(this.onEditHeaderClick, this, 'datetime')); toolbar.btnInsSlideNum.on('click', _.bind(this.onEditHeaderClick, this, 'slidenum')); + Common.Gateway.on('insertimage', _.bind(this.insertImage, this)); this.onSetupCopyStyleButton(); }, @@ -1390,13 +1391,23 @@ define([ } })).show(); } else if (opts === 'storage') { - (new Common.Views.SelectFileDlg({ - fileChoiceUrl: me.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") - })).on('selectfile', function(obj, file){ - me.toolbar.fireEvent('insertimage', me.toolbar); - me.api.AddImageUrl(file.url, undefined, true);// for loading from storage; - Common.component.Analytics.trackEvent('ToolBar', 'Image'); - }).show(); + if (this.toolbar.mode.canRequestInsertImage) { + Common.Gateway.requestInsertImage(); + } else { + (new Common.Views.SelectFileDlg({ + fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") + })).on('selectfile', function(obj, file){ + me.insertImage(file); + }).show(); + } + } + }, + + insertImage: function(data) { + if (data && data.url) { + this.toolbar.fireEvent('insertimage', this.toolbar); + this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage + Common.component.Analytics.trackEvent('ToolBar', 'Image'); } }, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index c8be815d9..94d25fb03 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -323,6 +323,7 @@ define([ this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers; this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify; this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs; + this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage; this.headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header'); this.headerView.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '') diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 29b125961..731856662 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -365,6 +365,7 @@ define([ toolbar.btnImgForward.on('click', this.onImgArrangeSelect.bind(this, 'forward')); toolbar.btnImgBackward.on('click', this.onImgArrangeSelect.bind(this, 'backward')); toolbar.btnEditHeader.on('click', _.bind(this.onEditHeaderClick, this)); + Common.Gateway.on('insertimage', _.bind(this.insertImage, this)); this.onSetupCopyStyleButton(); } @@ -862,14 +863,23 @@ define([ } })).show(); } else if (item.value === 'storage') { - var me = this; - (new Common.Views.SelectFileDlg({ - fileChoiceUrl: me.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") - })).on('selectfile', function(obj, file){ - me.toolbar.fireEvent('insertimage', me.toolbar); - me.api.asc_addImageDrawingObject(file.url, undefined, true);// for loading from storage; - Common.component.Analytics.trackEvent('ToolBar', 'Image'); - }).show(); + if (this.toolbar.mode.canRequestInsertImage) { + Common.Gateway.requestInsertImage(); + } else { + (new Common.Views.SelectFileDlg({ + fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") + })).on('selectfile', function(obj, file){ + me.insertImage(file); + }).show(); + } + } + }, + + insertImage: function(data) { + if (data && data.url) { + this.toolbar.fireEvent('insertimage', this.toolbar); + this.api.asc_addImageDrawingObject(data.url, undefined, data.token);// for loading from storage + Common.component.Analytics.trackEvent('ToolBar', 'Image'); } }, From 11c659dd915c50d63ee6099457323110713a240b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 26 Jul 2019 16:20:43 +0300 Subject: [PATCH 04/69] Fix show error when editor is loading --- apps/documenteditor/main/index.html | 2 +- apps/documenteditor/main/index.html.deploy | 2 +- apps/presentationeditor/main/index.html | 2 +- apps/presentationeditor/main/index.html.deploy | 2 +- apps/spreadsheeteditor/main/index.html | 2 +- apps/spreadsheeteditor/main/index.html.deploy | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 0e92951fb..145a0b453 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -19,7 +19,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loader-page { diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index e2bea029e..45faf2f30 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -20,7 +20,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loader-page { diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index e8902a029..069ad3a3f 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -18,7 +18,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loader-page { diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index 35b7f18ae..f863038ca 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -20,7 +20,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loader-page { diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 158ad8d9c..beffffca5 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -17,7 +17,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loader-page { diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index a9b557dd1..e3f5920b7 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -19,7 +19,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loader-page { From ec2e142af4fc5a38f49006123eddfd7be98eed31 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Fri, 26 Jul 2019 17:49:18 +0300 Subject: [PATCH 05/69] [SSE] Rename Rename empty-workbook.js -> empty.js --- apps/spreadsheeteditor/sdk_dev_scripts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index d0dd559be..a2e7f5d1b 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -86,7 +86,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/vendor/easysax.js", "../../../../sdkjs/common/openxml.js", "../../../../sdkjs/common/intervalTree.js", - "../../../../sdkjs/cell/document/empty-workbook.js", + "../../../../sdkjs/cell/document/empty.js", "../../../../sdkjs/cell/model/UndoRedo.js", "../../../../sdkjs/cell/model/clipboard.js", "../../../../sdkjs/cell/model/autofilters.js", From 3d5351d3f6375f78052a6d2290bcc9c4fe23fbc3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Jul 2019 12:49:02 +0300 Subject: [PATCH 06/69] [Mobile] Refactoring --- apps/documenteditor/mobile/app/controller/Toolbar.js | 2 +- apps/presentationeditor/mobile/app/controller/Toolbar.js | 2 +- apps/spreadsheeteditor/mobile/app/controller/Toolbar.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/Toolbar.js b/apps/documenteditor/mobile/app/controller/Toolbar.js index 1c32ee6c4..ccd784064 100644 --- a/apps/documenteditor/mobile/app/controller/Toolbar.js +++ b/apps/documenteditor/mobile/app/controller/Toolbar.js @@ -81,7 +81,7 @@ define([ this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo')); this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)) + this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)); this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); }, diff --git a/apps/presentationeditor/mobile/app/controller/Toolbar.js b/apps/presentationeditor/mobile/app/controller/Toolbar.js index 1f268a8a5..e9f6a53a0 100644 --- a/apps/presentationeditor/mobile/app/controller/Toolbar.js +++ b/apps/presentationeditor/mobile/app/controller/Toolbar.js @@ -80,7 +80,7 @@ define([ this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo')); this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)) + this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)); this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); }, diff --git a/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js b/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js index e886dce69..6f969e151 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js @@ -87,7 +87,7 @@ define([ this.api.asc_registerCallback('asc_onWorksheetLocked', _.bind(this.onApiWorksheetLocked, this)); this.api.asc_registerCallback('asc_onActiveSheetChanged', _.bind(this.onApiActiveSheetChanged, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)) + this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)); this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); From 6a028c838fbe0e9c4631d204ebe851004ed3bce2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Jul 2019 13:04:43 +0300 Subject: [PATCH 07/69] Fix Bug 42237 --- build/Gruntfile.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/Gruntfile.js b/build/Gruntfile.js index 206692a1d..37c317e18 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -289,6 +289,11 @@ module.exports = function(grunt) { options: { plugins: [{ cleanupIDs: false + }, + { + convertPathData: { + floatPrecision: 4 + } }] }, dist: { From 9d451b93e9c294b9ac61437fc2d5f63de77f66ed Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Jul 2019 13:34:34 +0300 Subject: [PATCH 08/69] [DE] Use onRequestSaveAs event for mail merge --- .../main/app/view/MailMergeSettings.js | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index 90b5d27d0..fa32bd838 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -365,7 +365,7 @@ define([ this.$el.on('click', '#mmerge-readmore-link', _.bind(this.openHelp, this)); if (this.mode) { - if (!this.mode.mergeFolderUrl) + if (!this.mode.canRequestSaveAs && !this.mode.mergeFolderUrl) this.btnPortal.setVisible(false); if (!this.mode.canSendEmailAddresses) { this._arrMergeSrc.pop(); @@ -426,7 +426,7 @@ define([ if (num>this._state.recipientsCount-1) num = this._state.recipientsCount-1; this.lockControls(DE.enumLockMM.noRecipients, this._state.recipientsCount<1, { - array: (this.mode.mergeFolderUrl) ? [this.btnPortal] : [], + array: (this.mode.canRequestSaveAs || this.mode.mergeFolderUrl) ? [this.btnPortal] : [], merge: true }); @@ -537,28 +537,33 @@ define([ if (this._mailMergeDlg) return; var me = this; if (this.cmbMergeTo.getValue() != Asc.c_oAscFileType.HTML) { - me._mailMergeDlg = new Common.Views.SaveAsDlg({ - saveFolderUrl: me.mode.mergeFolderUrl, - saveFileUrl: url, - defFileName: me.defFileName + ((this.cmbMergeTo.getValue() == Asc.c_oAscFileType.PDF) ? '.pdf' : '.docx') - }); - me._mailMergeDlg.on('saveasfolder', function(obj, folder){ // save last folder - }).on('saveaserror', function(obj, err){ // save last folder - var config = { - closable: false, - title: me.notcriticalErrorTitle, - msg: err, - iconCls: 'warn', - buttons: ['ok'], - callback: function(btn){ - me.fireEvent('editcomplete', me); - } - }; - Common.UI.alert(config); - }).on('close', function(obj){ - me._mailMergeDlg = undefined; - }); - me._mailMergeDlg.show(); + var defFileName = me.defFileName + ((this.cmbMergeTo.getValue() == Asc.c_oAscFileType.PDF) ? '.pdf' : '.docx'); + if (me.mode.canRequestSaveAs) { + Common.Gateway.requestSaveAs(url, defFileName); + } else { + me._mailMergeDlg = new Common.Views.SaveAsDlg({ + saveFolderUrl: me.mode.mergeFolderUrl, + saveFileUrl: url, + defFileName: defFileName + }); + me._mailMergeDlg.on('saveasfolder', function(obj, folder){ // save last folder + }).on('saveaserror', function(obj, err){ // save last folder + var config = { + closable: false, + title: me.notcriticalErrorTitle, + msg: err, + iconCls: 'warn', + buttons: ['ok'], + callback: function(btn){ + me.fireEvent('editcomplete', me); + } + }; + Common.UI.alert(config); + }).on('close', function(obj){ + me._mailMergeDlg = undefined; + }); + me._mailMergeDlg.show(); + } } }, @@ -766,7 +771,7 @@ define([ onCmbMergeToSelect: function(combo, record) { var mergeVisible = (record.value == Asc.c_oAscFileType.HTML); this.btnMerge.setVisible(mergeVisible); - this.btnPortal.setVisible(!mergeVisible && this.mode.mergeFolderUrl); + this.btnPortal.setVisible(!mergeVisible && (this.mode.canRequestSaveAs || this.mode.mergeFolderUrl)); this.btnDownload.setVisible(!mergeVisible); }, @@ -778,7 +783,7 @@ define([ if (this._initSettings) return; this.lockControls(DE.enumLockMM.lostConnect, disable, { - array: _.union([this.btnEditData, this.btnInsField, this.chHighlight], (this.mode.mergeFolderUrl) ? [this.btnPortal] : []), + array: _.union([this.btnEditData, this.btnInsField, this.chHighlight], (this.mode.canRequestSaveAs || this.mode.mergeFolderUrl) ? [this.btnPortal] : []), merge: true }); }, From 2652e09372022f705330111db228bff3c51c9319 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Jul 2019 13:40:07 +0300 Subject: [PATCH 09/69] Add onRequestMailMergeRecipients event, setMailMergeRecipients method for mail merge --- apps/api/documents/api.js | 11 +++++- apps/common/Gateway.js | 8 ++++ .../main/app/controller/Main.js | 1 + .../main/app/controller/Toolbar.js | 39 +++++++++++-------- 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index a3cff0e83..77319b610 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -204,6 +204,7 @@ _config.editorConfig.mergeFolderUrl = _config.editorConfig.mergeFolderUrl || _config.editorConfig.saveAsUrl; _config.editorConfig.canRequestSaveAs = _config.events && !!_config.events.onRequestSaveAs; _config.editorConfig.canRequestInsertImage = _config.events && !!_config.events.onRequestInsertImage; + _config.editorConfig.canRequestMailMergeRecipients = _config.events && !!_config.events.onRequestMailMergeRecipients; _config.frameEditorId = placeholderId; _config.events && !!_config.events.onReady && console.log("Obsolete: The onReady event is deprecated. Please use onAppReady instead."); @@ -569,6 +570,13 @@ }); }; + var _setMailMergeRecipients = function(data) { + _sendCommand({ + command: 'setMailMergeRecipients', + data: data + }); + }; + var _processMouse = function(evt) { var r = iframe.getBoundingClientRect(); var data = { @@ -612,7 +620,8 @@ setUsers : _setUsers, showSharingSettings : _showSharingSettings, setSharingSettings : _setSharingSettings, - insertImage : _insertImage + insertImage : _insertImage, + setMailMergeRecipients: _setMailMergeRecipients } }; diff --git a/apps/common/Gateway.js b/apps/common/Gateway.js index 5ba1710a2..b8e90ebad 100644 --- a/apps/common/Gateway.js +++ b/apps/common/Gateway.js @@ -114,6 +114,10 @@ if (Common === undefined) { 'insertImage': function(data) { $me.trigger('insertimage', data); + }, + + 'setMailMergeRecipients': function(data) { + $me.trigger('setmailmergerecipients', data); } }; @@ -300,6 +304,10 @@ if (Common === undefined) { _postMessage({event:'onRequestInsertImage'}) }, + requestMailMergeRecipients: function () { + _postMessage({event:'onRequestMailMergeRecipients'}) + }, + on: function(event, handler){ var localHandler = function(event, data){ handler.call(me, data) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index eacd8804f..cb4904416 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -351,6 +351,7 @@ define([ this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify; this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs; this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage; + this.appOptions.canRequestMailMergeRecipients = this.editorConfig.canRequestMailMergeRecipients; appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header'); appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '') diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 2c33652e4..f093edef4 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -324,6 +324,7 @@ define([ toolbar.mnuNoControlsColor.on('click', _.bind(this.onNoControlsColor, this)); toolbar.mnuControlsColorPicker.on('select', _.bind(this.onSelectControlsColor, this)); Common.Gateway.on('insertimage', _.bind(this.insertImage, this)); + Common.Gateway.on('setmailmergerecipients', _.bind(this.setMailMergeRecipients, this)); $('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this)); $('#id-save-style-plus, #id-save-style-link', toolbar.$el).on('click', this.onMenuSaveStyle.bind(this)); @@ -2605,7 +2606,7 @@ define([ this.toolbar.btnRedo.setDisabled(this._state.can_redo!==true); this.toolbar.btnCopy.setDisabled(this._state.can_copycut!==true); this.toolbar.btnPrint.setDisabled(!this.toolbar.mode.canPrint); - if (this.toolbar.mode.fileChoiceUrl) + if (this.toolbar.mode.fileChoiceUrl || this.toolbar.mode.canRequestMailMergeRecipients) this.toolbar.btnMailRecepients.setDisabled(false); this._state.activated = true; @@ -2803,22 +2804,28 @@ define([ onSelectRecepientsClick: function() { if (this._mailMergeDlg) return; - var me = this; - me._mailMergeDlg = new Common.Views.SelectFileDlg({ - fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "xlsx").replace("{documentType}", "") - }); - me._mailMergeDlg.on('selectfile', function(obj, recepients){ - me.api.asc_StartMailMerge(recepients); - if (!me.mergeEditor) - me.mergeEditor = me.getApplication().getController('Common.Controllers.ExternalMergeEditor').getView('Common.Views.ExternalMergeEditor'); - if (me.mergeEditor) - me.mergeEditor.setEditMode(false); + if (this.toolbar.mode.canRequestMailMergeRecipients) { + Common.Gateway.requestMailMergeRecipients(); + } else { + var me = this; + me._mailMergeDlg = new Common.Views.SelectFileDlg({ + fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "xlsx").replace("{documentType}", "") + }); + me._mailMergeDlg.on('selectfile', function(obj, recepients){ + me.setMailMergeRecipients(recepients); + }).on('close', function(obj){ + me._mailMergeDlg = undefined; + }); + me._mailMergeDlg.show(); + } + }, - }).on('close', function(obj){ - me._mailMergeDlg = undefined; - }); - - me._mailMergeDlg.show(); + setMailMergeRecipients: function(recepients) { + this.api.asc_StartMailMerge(recepients); + if (!this.mergeEditor) + this.mergeEditor = this.getApplication().getController('Common.Controllers.ExternalMergeEditor').getView('Common.Views.ExternalMergeEditor'); + if (this.mergeEditor) + this.mergeEditor.setEditMode(false); }, createDelayedElements: function() { From de847a572642eb7c5273553501a92a7fcfc953e6 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 29 Jul 2019 13:49:42 +0300 Subject: [PATCH 10/69] [mobile] Changed icons in Context menu --- apps/documenteditor/mobile/resources/css/app-ios.css | 6 +++--- apps/documenteditor/mobile/resources/css/app-material.css | 6 +++--- apps/documenteditor/mobile/resources/less/ios/_icons.less | 8 ++++---- .../mobile/resources/less/material/_icons.less | 6 +++--- apps/presentationeditor/mobile/resources/css/app-ios.css | 6 +++--- .../mobile/resources/css/app-material.css | 6 +++--- .../mobile/resources/less/ios/_icons.less | 6 +++--- .../mobile/resources/less/material/_icons.less | 6 +++--- apps/spreadsheeteditor/mobile/resources/css/app-ios.css | 6 +++--- .../mobile/resources/css/app-material.css | 6 +++--- .../mobile/resources/less/ios/_icons.less | 6 +++--- .../mobile/resources/less/material/_icons.less | 6 +++--- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index 4c600bf19..54cf0486a 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6949,17 +6949,17 @@ i.icon.icon-footnote { i.icon.icon-cut { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); } i.icon.icon-copy { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-paste { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E"); } .label-switch input[type="checkbox"]:checked + .checkbox { background: #446995; diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index b830d72e1..5cb814b39 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -6429,17 +6429,17 @@ i.icon.icon-footnote { i.icon.icon-cut { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); } i.icon.icon-copy { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-paste { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E"); } .navbar i.icon.icon-undo { width: 22px; diff --git a/apps/documenteditor/mobile/resources/less/ios/_icons.less b/apps/documenteditor/mobile/resources/less/ios/_icons.less index 03d035167..1d044a02a 100644 --- a/apps/documenteditor/mobile/resources/less/ios/_icons.less +++ b/apps/documenteditor/mobile/resources/less/ios/_icons.less @@ -459,16 +459,16 @@ i.icon { &.icon-cut { width: 24px; height: 24px; - .encoded-svg-background(''); - } + .encoded-svg-background(''); + } &.icon-copy { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-paste { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/resources/less/material/_icons.less b/apps/documenteditor/mobile/resources/less/material/_icons.less index da3252478..0bea41658 100644 --- a/apps/documenteditor/mobile/resources/less/material/_icons.less +++ b/apps/documenteditor/mobile/resources/less/material/_icons.less @@ -386,17 +386,17 @@ i.icon { &.icon-cut { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-copy { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-paste { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } } diff --git a/apps/presentationeditor/mobile/resources/css/app-ios.css b/apps/presentationeditor/mobile/resources/css/app-ios.css index cbd29c840..73d3feb0d 100644 --- a/apps/presentationeditor/mobile/resources/css/app-ios.css +++ b/apps/presentationeditor/mobile/resources/css/app-ios.css @@ -6895,17 +6895,17 @@ i.icon.icon-app-settings { i.icon.icon-cut { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); } i.icon.icon-copy { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-paste { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E"); } .label-switch input[type="checkbox"]:checked + .checkbox { background: #aa5252; diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index 2f83aeb7d..e3141f1a9 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -6419,17 +6419,17 @@ i.icon.icon-app-settings { i.icon.icon-cut { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); } i.icon.icon-copy { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-paste { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E"); } .navbar i.icon.icon-undo { width: 22px; diff --git a/apps/presentationeditor/mobile/resources/less/ios/_icons.less b/apps/presentationeditor/mobile/resources/less/ios/_icons.less index f18b1a51d..151f6aee8 100644 --- a/apps/presentationeditor/mobile/resources/less/ios/_icons.less +++ b/apps/presentationeditor/mobile/resources/less/ios/_icons.less @@ -413,16 +413,16 @@ i.icon { &.icon-cut { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-copy { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-paste { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } } \ No newline at end of file diff --git a/apps/presentationeditor/mobile/resources/less/material/_icons.less b/apps/presentationeditor/mobile/resources/less/material/_icons.less index c1727bc4f..3fce40fe4 100644 --- a/apps/presentationeditor/mobile/resources/less/material/_icons.less +++ b/apps/presentationeditor/mobile/resources/less/material/_icons.less @@ -383,17 +383,17 @@ i.icon { &.icon-cut { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-copy { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-paste { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } } diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index ebe1733cd..c24d88b3f 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -6786,17 +6786,17 @@ i.icon.icon-table-settings { i.icon.icon-cut { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); } i.icon.icon-copy { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-paste { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E"); } .chart-types .thumb.bar-normal { background-image: url('../img/charts/chart-03.png'); diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index 275f928f6..d6ef3b826 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -6412,17 +6412,17 @@ i.icon.icon-collaboration { i.icon.icon-cut { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); } i.icon.icon-copy { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-paste { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E"); } .navbar i.icon.icon-undo { width: 22px; diff --git a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less index 603d5ea4c..b1df25db5 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less @@ -371,17 +371,17 @@ i.icon { &.icon-cut { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-copy { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-paste { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } } diff --git a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less index a6ba74d6b..da8b912fa 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less @@ -335,17 +335,17 @@ i.icon { &.icon-cut { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-copy { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-paste { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } } From ee15f9d250534a2be6a896032cb7aa14a4ccc3c5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Jul 2019 15:50:55 +0300 Subject: [PATCH 11/69] Fix inserting image from storage --- apps/documenteditor/main/app/view/Toolbar.js | 2 +- apps/presentationeditor/main/app/view/Toolbar.js | 2 +- apps/spreadsheeteditor/main/app/view/Toolbar.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index ccb569908..f6efa669c 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2055,7 +2055,7 @@ define([ this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles); this.btnContentControls.menu.items[4].setVisible(mode.canEditContentControl); this.btnContentControls.menu.items[5].setVisible(mode.canEditContentControl); - this.mnuInsertImage.items[2].setVisible(this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1); + this.mnuInsertImage.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1); }, onSendThemeColorSchemes: function (schemas) { diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index c71d95291..cd366f3aa 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -983,7 +983,7 @@ define([ me.fireEvent('insert:image', [item.value]); }) ); - btn.menu.items[2].setVisible(config.fileChoiceUrl && config.fileChoiceUrl.indexOf("{documentType}")>-1); + btn.menu.items[2].setVisible(config.canRequestInsertImage || config.fileChoiceUrl && config.fileChoiceUrl.indexOf("{documentType}")>-1); }); me.btnsInsertText.forEach(function (btn) { diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index cad2d4776..32cc23def 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1462,7 +1462,7 @@ define([ $(mnu.el).html(mnu.template({id: Common.UI.getId(), caption : mnu.caption, options : mnu.options})); } else this.btnPageMargins.menu.items[0].setVisible(false); - this.btnInsertImage.menu.items[2].setVisible(mode.fileChoiceUrl && mode.fileChoiceUrl.indexOf("{documentType}")>-1); + this.btnInsertImage.menu.items[2].setVisible(mode.canRequestInsertImage || mode.fileChoiceUrl && mode.fileChoiceUrl.indexOf("{documentType}")>-1); } me.setTab('home'); From d9f90692d820782220d3b8daa6794b2b618f52a8 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 30 Jul 2019 11:12:26 +0300 Subject: [PATCH 12/69] [mobile] Change display Collaboration icons --- apps/documenteditor/mobile/app/template/Settings.template | 2 +- apps/documenteditor/mobile/app/template/Toolbar.template | 2 +- apps/documenteditor/mobile/app/view/Settings.js | 3 ++- apps/documenteditor/mobile/app/view/Toolbar.js | 3 ++- apps/presentationeditor/mobile/app/template/Settings.template | 2 +- apps/presentationeditor/mobile/app/template/Toolbar.template | 2 +- apps/presentationeditor/mobile/app/view/Settings.js | 3 ++- apps/presentationeditor/mobile/app/view/Toolbar.js | 3 ++- apps/spreadsheeteditor/mobile/app/template/Settings.template | 2 +- apps/spreadsheeteditor/mobile/app/template/Toolbar.template | 2 +- apps/spreadsheeteditor/mobile/app/view/Settings.js | 3 ++- apps/spreadsheeteditor/mobile/app/view/Toolbar.js | 3 ++- 12 files changed, 18 insertions(+), 12 deletions(-) diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template index 9fd27d6be..b61faac15 100644 --- a/apps/documenteditor/mobile/app/template/Settings.template +++ b/apps/documenteditor/mobile/app/template/Settings.template @@ -55,7 +55,7 @@ <% } %> - <% if(phone) {%> + <% if(width < 360) {%>
    • <% } %> - <% if(phone) {%> + <% if(width < 390) {%>
    • <% } %> - <% if(phone) {%> + <% if(width < 360) {%>
    • +
  • + +
    +
    + +
    +
    +
    RTF
    +
    +
    +     +
    • diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 6532dee44..692b6ac02 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -158,6 +158,7 @@ define([ /**/ Common.NotificationCenter.on('api:disconnect', _.bind(me.onCoAuthoringDisconnect, me)); Common.NotificationCenter.on('goback', _.bind(me.goBack, me)); + Common.NotificationCenter.on('download:advanced', _.bind(me.onAdvancedOptions, me)); // Initialize descendants _.each(me.getApplication().controllers, function(controller) { @@ -1213,7 +1214,7 @@ define([ Common.Utils.ThemeColor.setColors(colors, standart_colors); }, - onAdvancedOptions: function(type, advOptions) { + onAdvancedOptions: function(type, advOptions, mode, formatOptions) { if (this._state.openDlg) return; var me = this; @@ -1251,7 +1252,12 @@ define([ delimiter = picker.cols[1].value; if (me.api) { - me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding, delimiter)); + if (mode==2) { + formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding)); + me.api.asc_DownloadAs(formatOptions); + } else { + me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding, delimiter)); + } if (!me._isDocReady) { me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index def0ccc68..c414ef7f4 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -200,7 +200,6 @@ define([ }); }).on('close', function () { $overlay.off('removeClass'); - $overlay.removeClass('modal-overlay-visible') }); } @@ -671,12 +670,12 @@ define([ format = $(e.currentTarget).data('format'); if (format) { - if (format == Asc.c_oAscFileType.TXT) { + if (format == Asc.c_oAscFileType.CSV) { uiApp.confirm( me.warnDownloadAs, me.notcriticalErrorTitle, function () { - me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); + Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.CSV, me.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format)); } ); } else { From 66ba422e056761258fbbdd3008ca432535af0aeb Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Jul 2019 15:24:47 +0300 Subject: [PATCH 19/69] [SSE] Show data validation tooltip --- .../main/app/controller/DocumentHolder.js | 61 ++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 2da2da7c1..f8ddaa468 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -77,7 +77,8 @@ define([ ttHeight: 20 }, filter: {ttHeight: 40}, - func_arg: {} + func_arg: {}, + input_msg: {} }; me.mouse = {}; me.popupmenu = false; @@ -289,6 +290,7 @@ define([ this.api.asc_registerCallback('asc_onToggleAutoCorrectOptions', _.bind(this.onToggleAutoCorrectOptions, this)); this.api.asc_registerCallback('asc_onFormulaInfo', _.bind(this.onFormulaInfo, this)); this.api.asc_registerCallback('asc_ChangeCropState', _.bind(this.onChangeCropState, this)); + this.api.asc_registerCallback('asc_onInputMessage', _.bind(this.onInputMessage, this)); } return this; }, @@ -2131,6 +2133,63 @@ define([ } }, + onInputMessage: function(title, message) { + var inputtip = this.tooltips.input_msg; + + if (message) { + if (!inputtip.parentEl) { + inputtip.parentEl = $('
    '); + this.documentHolder.cmpEl.append(inputtip.parentEl); + } + + var hint = title ? ('' + (title || '') + '
    ') : ''; + hint += (message || ''); + + if (inputtip.ref && inputtip.ref.isVisible()) { + if (inputtip.text != hint) { + inputtip.ref.hide(); + inputtip.ref = undefined; + inputtip.text = ''; + inputtip.isHidden = true; + } + } + + if (!inputtip.ref || !inputtip.ref.isVisible()) { + inputtip.text = hint; + inputtip.ref = new Common.UI.Tooltip({ + owner : inputtip.parentEl, + html : true, + title : hint + }); + + inputtip.ref.show([-10000, -10000]); + inputtip.isHidden = false; + } + + var pos = [ + this.documentHolder.cmpEl.offset().left - $(window).scrollLeft(), + this.documentHolder.cmpEl.offset().top - $(window).scrollTop() + ], + coord = this.api.asc_getActiveCellCoord(), + showPoint = [coord.asc_getX() + pos[0] - 3, coord.asc_getY() + pos[1] - inputtip.ref.getBSTip().$tip.height() - 5]; + var tipwidth = inputtip.ref.getBSTip().$tip.width(); + if (showPoint[0] + tipwidth > this.tooltips.coauth.bodyWidth ) + showPoint[0] = this.tooltips.coauth.bodyWidth - tipwidth; + + inputtip.ref.getBSTip().$tip.css({ + top : showPoint[1] + 'px', + left: showPoint[0] + 'px' + }); + } else { + if (!inputtip.isHidden && inputtip.ref) { + inputtip.ref.hide(); + inputtip.ref = undefined; + inputtip.text = ''; + inputtip.isHidden = true; + } + } + }, + onShowSpecialPasteOptions: function(specialPasteShowOptions) { var me = this, documentHolderView = me.documentHolder, From 4e2f5fdaeebd41e7d30048dc85b266b31ea13a55 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 30 Jul 2019 16:08:24 +0300 Subject: [PATCH 20/69] [mobile] Add icons --- .../mobile/app/template/Settings.template | 2 +- apps/documenteditor/mobile/resources/css/app-ios.css | 11 ++++++++--- .../mobile/resources/css/app-material.css | 11 ++++++++--- .../mobile/resources/less/ios/_icons.less | 11 ++++++++--- .../mobile/resources/less/material/_icons.less | 12 +++++++++--- .../mobile/resources/css/app-ios.css | 6 +++--- .../mobile/resources/css/app-material.css | 6 +++--- .../mobile/resources/less/ios/_icons.less | 6 +++--- .../mobile/resources/less/material/_icons.less | 6 +++--- 9 files changed, 46 insertions(+), 25 deletions(-) diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template index 14860621d..cc82c4032 100644 --- a/apps/documenteditor/mobile/app/template/Settings.template +++ b/apps/documenteditor/mobile/app/template/Settings.template @@ -571,7 +571,7 @@
    - +
    RTF
    diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index 54cf0486a..36046fb2f 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6872,9 +6872,9 @@ i.icon.icon-format-dotx { background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D.cls-2%7Bfill%3A%23fff%3B%7D.cls-3%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_38%22%20data-name%3D%22Path%2038%22%20d%3D%22M12.223%2C119.714c1.251-.066%2C2.5-.115%2C3.752-.177.875%2C4.123%2C1.771%2C8.239%2C2.718%2C12.343.744-4.239%2C1.567-8.464%2C2.363-12.7%2C1.317-.042%2C2.633-.109%2C3.944-.183-1.488%2C5.917-2.792%2C11.886-4.417%2C17.767-1.1.531-2.745-.026-4.049.06-.876-4.042-1.9-8.061-2.679-12.123-.77%2C3.945-1.771%2C7.854-2.653%2C11.775-1.264-.06-2.535-.134-3.805-.213C6.3%2C130.892%2C5.02%2C125.553%2C4%2C120.167c1.125-.049%2C2.258-.093%2C3.384-.129.678%2C3.889%2C1.448%2C7.762%2C2.041%2C11.659C10.353%2C127.7%2C11.3%2C123.708%2C12.223%2C119.714Z%22%20transform%3D%22translate(-2%20-117)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20class%3D%22cls-2%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } i.icon.icon-format-txt { - width: 30px; - height: 30px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-14.47%20-14.5%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2224%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2220%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2216%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2212%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%224%22%20%2F%3E%3Crect%20class%3D%22cls-1%22%20height%3D%221%22%20width%3D%2229.063%22%20%2F%3E%3C%2Fsvg%3E"); + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H2V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H2V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H2V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-format-pdf { width: 30px; @@ -6901,6 +6901,11 @@ i.icon.icon-format-html { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2262px%22%20height%3D%2262px%22%20viewBox%3D%220%200%2062%2062%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M24.993%2C38.689L11.34%2C32.753v-3.288l13.653-5.91v3.872l-9.523%2C3.641l9.523%2C3.777V38.689z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M27.09%2C41.298l4.931-20.596h2.867l-4.986%2C20.596H27.09z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M36.986%2C38.703v-3.845l9.536-3.75L36.986%2C27.4v-3.817l13.666%2C5.91v3.261L36.986%2C38.703z%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-rtf { + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Crect%20x%3D%222%22%20y%3D%222%22%20width%3D%227%22%20height%3D%227%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H11V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H11V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H11V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-collaboration { width: 24px; height: 24px; diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 5cb814b39..c6c7d000c 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -6352,9 +6352,9 @@ i.icon.icon-format-dotx { background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D.cls-2%7Bfill%3A%23fff%3B%7D.cls-3%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3CclipPath%20id%3D%22clip-dotx%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3Cg%20id%3D%22dotx%22%20clip-path%3D%22url(%23clip-dotx)%22%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_38%22%20data-name%3D%22Path%2038%22%20d%3D%22M12.223%2C119.714c1.251-.066%2C2.5-.115%2C3.752-.177.875%2C4.123%2C1.771%2C8.239%2C2.718%2C12.343.744-4.239%2C1.567-8.464%2C2.363-12.7%2C1.317-.042%2C2.633-.109%2C3.944-.183-1.488%2C5.917-2.792%2C11.886-4.417%2C17.767-1.1.531-2.745-.026-4.049.06-.876-4.042-1.9-8.061-2.679-12.123-.77%2C3.945-1.771%2C7.854-2.653%2C11.775-1.264-.06-2.535-.134-3.805-.213C6.3%2C130.892%2C5.02%2C125.553%2C4%2C120.167c1.125-.049%2C2.258-.093%2C3.384-.129.678%2C3.889%2C1.448%2C7.762%2C2.041%2C11.659C10.353%2C127.7%2C11.3%2C123.708%2C12.223%2C119.714Z%22%20transform%3D%22translate(-2%20-117)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20class%3D%22cls-2%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } i.icon.icon-format-txt { - width: 30px; - height: 30px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-14.47%20-14.5%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2224%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2220%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2216%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2212%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%224%22%20%2F%3E%3Crect%20class%3D%22cls-1%22%20height%3D%221%22%20width%3D%2229.063%22%20%2F%3E%3C%2Fsvg%3E"); + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H2V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H2V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H2V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-format-pdf { width: 30px; @@ -6381,6 +6381,11 @@ i.icon.icon-format-html { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2262px%22%20height%3D%2262px%22%20viewBox%3D%220%200%2062%2062%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M24.993%2C38.689L11.34%2C32.753v-3.288l13.653-5.91v3.872l-9.523%2C3.641l9.523%2C3.777V38.689z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M27.09%2C41.298l4.931-20.596h2.867l-4.986%2C20.596H27.09z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M36.986%2C38.703v-3.845l9.536-3.75L36.986%2C27.4v-3.817l13.666%2C5.91v3.261L36.986%2C38.703z%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-rtf { + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Crect%20x%3D%222%22%20y%3D%222%22%20width%3D%227%22%20height%3D%227%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H11V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H11V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H11V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-collaboration { width: 24px; height: 24px; diff --git a/apps/documenteditor/mobile/resources/less/ios/_icons.less b/apps/documenteditor/mobile/resources/less/ios/_icons.less index 1d044a02a..b5c848064 100644 --- a/apps/documenteditor/mobile/resources/less/ios/_icons.less +++ b/apps/documenteditor/mobile/resources/less/ios/_icons.less @@ -381,9 +381,9 @@ i.icon { .encoded-svg-background(''); } &.icon-format-txt { - width: 30px; - height: 30px; - .encoded-svg-background(''); + width: 24px; + height: 24px; + .encoded-svg-background(''); } &.icon-format-pdf { width: 30px; @@ -410,6 +410,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-rtf { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } // Collaboration &.icon-collaboration { width: 24px; diff --git a/apps/documenteditor/mobile/resources/less/material/_icons.less b/apps/documenteditor/mobile/resources/less/material/_icons.less index 0bea41658..681503ddb 100644 --- a/apps/documenteditor/mobile/resources/less/material/_icons.less +++ b/apps/documenteditor/mobile/resources/less/material/_icons.less @@ -308,9 +308,9 @@ i.icon { .encoded-svg-background(''); } &.icon-format-txt { - width: 30px; - height: 30px; - .encoded-svg-background(''); + width: 24px; + height: 24px; + .encoded-svg-background(''); } &.icon-format-pdf { width: 30px; @@ -337,6 +337,12 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-rtf { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + // Collaboration &.icon-collaboration { width: 24px; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index c24d88b3f..237a3ee33 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -6764,9 +6764,9 @@ i.icon.icon-format-ots { background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3CclipPath%20id%3D%22clip-ots%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22ots%22%20clip-path%3D%22url(%23clip-ots)%22%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_33%22%20data-name%3D%22Path%2033%22%20d%3D%22M125.173%2C121h0c-.046-.03-.093-.059-.141-.088a6.133%2C6.133%2C0%2C0%2C0-2.467-.869%2C6.014%2C6.014%2C0%2C0%2C0-4.309%2C1.188%2C6.223%2C6.223%2C0%2C0%2C0-2.892-1.147%2C5.965%2C5.965%2C0%2C0%2C0-4.039%2C1l-.036.024a.176.176%2C0%2C0%2C0-.049.125.145.145%2C0%2C0%2C0%2C.126.158l.019%2C0a.019.019%2C0%2C0%2C0%2C.009%2C0%2C5.781%2C5.781%2C0%2C0%2C1%2C2.005-.111%2C6.41%2C6.41%2C0%2C0%2C1%2C4.782%2C2.669c.06.081.115.076.178%2C0a6.288%2C6.288%2C0%2C0%2C1%2C6.194-2.735c.136.017.27.038.4.064.047.009.119.024.161.03.08.011.123-.071.123-.159A.155.155%2C0%2C0%2C0%2C125.173%2C121Z%22%20transform%3D%22translate(-94.24%20-116)%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_34%22%20data-name%3D%22Path%2034%22%20d%3D%22M126.894%2C125.978a.175.175%2C0%2C0%2C0-.022-.011%2C11.686%2C11.686%2C0%2C0%2C0-4.905-1.082%2C11.924%2C11.924%2C0%2C0%2C0-7.444%2C2.647%2C11.725%2C11.725%2C0%2C0%2C0-5.251-1.245%2C11.884%2C11.884%2C0%2C0%2C0-7.176%2C2.441.229.229%2C0%2C0%2C0-.022.016.217.217%2C0%2C0%2C0-.073.167.2.2%2C0%2C0%2C0%2C.191.211.167.167%2C0%2C0%2C0%2C.037%2C0%2C.118.118%2C0%2C0%2C0%2C.023-.008%2C11.679%2C11.679%2C0%2C0%2C1%2C3.71-.608c3.429%2C0%2C6.486.9%2C8.787%2C3.315a.093.093%2C0%2C0%2C1%2C.016.016.172.172%2C0%2C0%2C0%2C.123.052.18.18%2C0%2C0%2C0%2C.147-.078s.075-.115.111-.171a12.1%2C12.1%2C0%2C0%2C1%2C10.479-5.315c.306%2C0%2C.611.014.912.037l.273.022a.2.2%2C0%2C0%2C0%2C.191-.211A.211.211%2C0%2C0%2C0%2C126.894%2C125.978Z%22%20transform%3D%22translate(-100%20-115.885)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } i.icon.icon-format-csv { - width: 30px; - height: 30px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%22%20y%3D%220px%22%20x%3D%220px%22%20xml%3Aspace%3D%22preserve%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2235.5%22%20%2F%3E%3C%2Fsvg%3E"); + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%2017H16V18H22V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2020H16V21H22V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2014H16V15H22V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2011H16V12H22V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%208H16V9H22V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%205H16V6H22V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%202H16V3H22V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2017H9V18H15V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2020H9V21H15V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2014H9V15H15V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2011H9V12H15V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%208H9V9H15V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%205H9V6H15V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%202H9V3H15V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2017H2V18H8V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2020H2V21H8V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2014H2V15H8V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2011H2V12H8V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%208H2V9H8V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%205H2V6H8V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%202H2V3H8V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-collaboration { width: 24px; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index d6ef3b826..d1815863b 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -6400,9 +6400,9 @@ i.icon.icon-format-ots { background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3CclipPath%20id%3D%22clip-ots%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22ots%22%20clip-path%3D%22url(%23clip-ots)%22%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_33%22%20data-name%3D%22Path%2033%22%20d%3D%22M125.173%2C121h0c-.046-.03-.093-.059-.141-.088a6.133%2C6.133%2C0%2C0%2C0-2.467-.869%2C6.014%2C6.014%2C0%2C0%2C0-4.309%2C1.188%2C6.223%2C6.223%2C0%2C0%2C0-2.892-1.147%2C5.965%2C5.965%2C0%2C0%2C0-4.039%2C1l-.036.024a.176.176%2C0%2C0%2C0-.049.125.145.145%2C0%2C0%2C0%2C.126.158l.019%2C0a.019.019%2C0%2C0%2C0%2C.009%2C0%2C5.781%2C5.781%2C0%2C0%2C1%2C2.005-.111%2C6.41%2C6.41%2C0%2C0%2C1%2C4.782%2C2.669c.06.081.115.076.178%2C0a6.288%2C6.288%2C0%2C0%2C1%2C6.194-2.735c.136.017.27.038.4.064.047.009.119.024.161.03.08.011.123-.071.123-.159A.155.155%2C0%2C0%2C0%2C125.173%2C121Z%22%20transform%3D%22translate(-94.24%20-116)%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_34%22%20data-name%3D%22Path%2034%22%20d%3D%22M126.894%2C125.978a.175.175%2C0%2C0%2C0-.022-.011%2C11.686%2C11.686%2C0%2C0%2C0-4.905-1.082%2C11.924%2C11.924%2C0%2C0%2C0-7.444%2C2.647%2C11.725%2C11.725%2C0%2C0%2C0-5.251-1.245%2C11.884%2C11.884%2C0%2C0%2C0-7.176%2C2.441.229.229%2C0%2C0%2C0-.022.016.217.217%2C0%2C0%2C0-.073.167.2.2%2C0%2C0%2C0%2C.191.211.167.167%2C0%2C0%2C0%2C.037%2C0%2C.118.118%2C0%2C0%2C0%2C.023-.008%2C11.679%2C11.679%2C0%2C0%2C1%2C3.71-.608c3.429%2C0%2C6.486.9%2C8.787%2C3.315a.093.093%2C0%2C0%2C1%2C.016.016.172.172%2C0%2C0%2C0%2C.123.052.18.18%2C0%2C0%2C0%2C.147-.078s.075-.115.111-.171a12.1%2C12.1%2C0%2C0%2C1%2C10.479-5.315c.306%2C0%2C.611.014.912.037l.273.022a.2.2%2C0%2C0%2C0%2C.191-.211A.211.211%2C0%2C0%2C0%2C126.894%2C125.978Z%22%20transform%3D%22translate(-100%20-115.885)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } i.icon.icon-format-csv { - width: 30px; - height: 30px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%22%20y%3D%220px%22%20x%3D%220px%22%20xml%3Aspace%3D%22preserve%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2235.5%22%20%2F%3E%3C%2Fsvg%3E"); + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%2017H16V18H22V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2020H16V21H22V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2014H16V15H22V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2011H16V12H22V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%208H16V9H22V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%205H16V6H22V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%202H16V3H22V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2017H9V18H15V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2020H9V21H15V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2014H9V15H15V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2011H9V12H15V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%208H9V9H15V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%205H9V6H15V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%202H9V3H15V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2017H2V18H8V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2020H2V21H8V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2014H2V15H8V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2011H2V12H8V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%208H2V9H8V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%205H2V6H8V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%202H2V3H8V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-collaboration { width: 24px; diff --git a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less index b1df25db5..462c2cfde 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less @@ -348,9 +348,9 @@ i.icon { .encoded-svg-background(''); } &.icon-format-csv { - width: 30px; - height: 30px; - .encoded-svg-background(''); + width: 24px; + height: 24px; + .encoded-svg-background(''); } // Collaboration &.icon-collaboration { diff --git a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less index da8b912fa..6c2e8a2aa 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less @@ -322,9 +322,9 @@ i.icon { .encoded-svg-background(''); } &.icon-format-csv { - width: 30px; - height: 30px; - .encoded-svg-background(''); + width: 24px; + height: 24px; + .encoded-svg-background(''); } // Collaboration &.icon-collaboration { From 00a1842f857f57ee708abbdc09a6984a4a1f4568 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 30 Jul 2019 17:14:25 +0300 Subject: [PATCH 21/69] [mobile] Fix display "Choose TXT/CSV Options" (Download As) --- .../mobile/app/controller/Main.js | 55 ++++++++++-------- .../mobile/app/controller/Settings.js | 5 +- .../mobile/app/template/Settings.template | 24 ++++---- .../mobile/app/controller/Main.js | 57 +++++++++++-------- 4 files changed, 80 insertions(+), 61 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 173946bec..dac5a9940 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -1132,6 +1132,37 @@ define([ me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + var buttons = []; + if (mode === 2) { + buttons.push({ + text: me.textCancel, + onClick: function () { + me._state.openDlg = null; + } + }); + } + buttons.push({ + text: 'OK', + bold: true, + onClick: function() { + var encoding = picker.value; + + if (me.api) { + if (mode==2) { + formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding)); + me.api.asc_DownloadAs(formatOptions); + } else { + me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding)); + } + + if (!me._isDocReady) { + me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + } + } + me._state.openDlg = null; + } + }); + me._state.openDlg = uiApp.modal({ title: me.advTxtOptions, text: '', @@ -1142,29 +1173,7 @@ define([ '
    ' + '
    ' + '
    ', - buttons: [ - { - text: 'OK', - bold: true, - onClick: function() { - var encoding = picker.value; - - if (me.api) { - if (mode==2) { - formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding)); - me.api.asc_DownloadAs(formatOptions); - } else { - me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding)); - } - - if (!me._isDocReady) { - me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); - } - } - me._state.openDlg = null; - } - } - ] + buttons: buttons }); picker = uiApp.picker({ diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index 5e0791bc1..14eca0c6f 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -564,7 +564,7 @@ define([ if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) { _.defer(function () { uiApp.confirm( - me.warnDownloadAs, + (format === Asc.c_oAscFileType.TXT) ? me.warnDownloadAs : me.warnDownloadAsRTF, me.notcriticalErrorTitle, function () { Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.TXT, me.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format)); @@ -746,7 +746,8 @@ define([ unknownText: 'Unknown', txtLoading : 'Loading...', notcriticalErrorTitle : 'Warning', - warnDownloadAs : 'If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?' + warnDownloadAs : 'If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?', + warnDownloadAsRTF : 'If you continue saving in this format some of the formatting might be lost.
    Are you sure you want to continue?' } })(), DE.Controllers.Settings || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template index cc82c4032..129b99184 100644 --- a/apps/documenteditor/mobile/app/template/Settings.template +++ b/apps/documenteditor/mobile/app/template/Settings.template @@ -519,6 +519,18 @@     +
  • + +
    +
    + +
    +
    +
    RTF
    +
    +
    +     +
  • @@ -567,18 +579,6 @@
    • -
  • - -
    -
    - -
    -
    -
    RTF
    -
    -
    -     -
    • diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 692b6ac02..db5d7ff8c 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1232,6 +1232,38 @@ define([ me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + var buttons = []; + if (mode === 2) { + buttons.push({ + text: me.textCancel, + onClick: function () { + me._state.openDlg = null; + } + }); + } + buttons.push({ + text: 'OK', + bold: true, + onClick: function() { + var encoding = picker.cols[0].value, + delimiter = picker.cols[1].value; + + if (me.api) { + if (mode==2) { + formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding, delimiter)); + me.api.asc_DownloadAs(formatOptions); + } else { + me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding, delimiter)); + } + + if (!me._isDocReady) { + me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + } + } + me._state.openDlg = null; + } + }); + me._state.openDlg = uiApp.modal({ title: me.advCSVOptions, text: '', @@ -1243,30 +1275,7 @@ define([ '' + '
    ' + '', - buttons: [ - { - text: 'OK', - bold: true, - onClick: function() { - var encoding = picker.cols[0].value, - delimiter = picker.cols[1].value; - - if (me.api) { - if (mode==2) { - formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding)); - me.api.asc_DownloadAs(formatOptions); - } else { - me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding, delimiter)); - } - - if (!me._isDocReady) { - me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); - } - } - me._state.openDlg = null; - } - } - ] + buttons: buttons }); var recommendedSettings = advOptions.asc_getRecommendedSettings(); From bd1d3af79fce41cd5c0dca39f016309a66cba9cd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 31 Jul 2019 11:16:58 +0300 Subject: [PATCH 22/69] [Common] Fix window title --- apps/common/main/lib/component/Window.js | 2 +- apps/common/main/resources/less/window.less | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index 752da533e..76432c6f2 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -164,7 +164,7 @@ define([ '<% if (closable!==false) %>' + '
    ' + '<% %>' + - '<%= title %> ' + + '
    <%= title %>
    ' + '' + '<% } %>' + '
    <%= tpl %>
    ' + diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index f0661610f..77f8bc5e5 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -85,6 +85,12 @@ &.resizing { cursor: inherit !important; } + + .title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } > .body { From 61de22e1d70b43be40f429b985a2ff919ab6702f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 31 Jul 2019 11:21:02 +0300 Subject: [PATCH 23/69] [SSE] Add Asc.c_oAscError.ID.DataValidate error --- .../main/app/controller/Main.js | 22 +++++++++++++++---- apps/spreadsheeteditor/main/locale/en.json | 1 + 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 94d25fb03..8686c02eb 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1367,6 +1367,17 @@ define([ config.msg = this.errorFrmlMaxTextLength; break; + case Asc.c_oAscError.ID.DataValidate: + var icon = errData ? errData.asc_getErrorStyle() : null; + if (icon) { + config.iconCls = (icon==Asc.c_oAscEDataValidationErrorStyle.Stop) ? 'error' : ((icon==Asc.c_oAscEDataValidationErrorStyle.Information) ? 'info' : 'warn'); + } + errData && errData.asc_getErrorTitle() && (config.title = errData.asc_getErrorTitle()); + config.buttons = ['ok', 'cancel']; + config.msg = errData && errData.asc_getError() ? errData.asc_getError() : this.errorDataValidate; + config.maxwidth = 600; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -1395,9 +1406,9 @@ define([ } else { Common.Gateway.reportWarning(id, config.msg); - config.title = this.notcriticalErrorTitle; - config.iconCls = 'warn'; - config.buttons = ['ok']; + config.title = config.title || this.notcriticalErrorTitle; + config.iconCls = config.iconCls || 'warn'; + config.buttons = config.buttons || ['ok']; config.callback = _.bind(function(btn){ if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) { Common.UI.Menu.Manager.hideAll(); @@ -1405,6 +1416,8 @@ define([ } else if (id == Asc.c_oAscError.ID.EditingError) { this.disableEditing(true); Common.NotificationCenter.trigger('api:disconnect', true); // enable download and print + } else if (id == Asc.c_oAscError.ID.DataValidate && btn !== 'ok') { + this.api.asc_closeCellEditor(); } this._state.lostEditingRights = false; this.onEditComplete(); @@ -2376,7 +2389,8 @@ define([ errorNoDataToParse: 'No data was selected to parse.', errorCannotUngroup: 'Cannot ungroup. To start an outline, select the detail rows or columns and group them.', errorFrmlMaxTextLength: 'Text values in formulas are limited to 255 characters.
    Use the CONCATENATE function or concatenation operator (&)', - waitText: 'Please, wait...' + waitText: 'Please, wait...', + errorDataValidate: 'The value you entered is not valid.
    A user has restricted values that can be entered into this cell.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index bea565081..9c87eab7c 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -471,6 +471,7 @@ "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.
    Wrong number of brackets is used.", "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.
    Please correct the error.", "SSE.Controllers.Main.errorFrmlMaxTextLength": "Text values in formulas are limited to 255 characters.
    Use the CONCATENATE function or concatenation operator (&).", + "SSE.Controllers.Main.errorDataValidate": "The value you entered is not valid.
    A user has restricted values that can be entered into this cell.", "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this spreadsheet. Click 'Stay on this Page' then 'Save' to save them. Click 'Leave this Page' to discard all the unsaved changes.", "SSE.Controllers.Main.loadFontsTextText": "Loading data...", "SSE.Controllers.Main.loadFontsTitleText": "Loading Data", From 1b81bc79f84707ab20271bd320ed8d433e65e314 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Wed, 31 Jul 2019 11:50:22 +0300 Subject: [PATCH 24/69] Add translation --- apps/documenteditor/mobile/locale/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 268d3347f..cde5dfabd 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -240,6 +240,7 @@ "DE.Controllers.Settings.txtLoading": "Loading...", "DE.Controllers.Settings.unknownText": "Unknown", "DE.Controllers.Settings.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", + "DE.Controllers.Settings.warnDownloadAsRTF": "If you continue saving in this format some of the formatting might be lost.
    Are you sure you want to continue?", "DE.Controllers.Toolbar.dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "DE.Controllers.Toolbar.dlgLeaveTitleText": "You leave the application", "DE.Controllers.Toolbar.leaveButtonText": "Leave this Page", From 640ceb6e090985396c782fc78429703c1b89f37f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 31 Jul 2019 13:52:37 +0300 Subject: [PATCH 25/69] [SSE] Add spellcheck to the left menu --- apps/spreadsheeteditor/main/app.js | 2 ++ .../main/app/controller/LeftMenu.js | 6 +++++ .../main/app/template/LeftMenu.template | 2 ++ .../main/app/view/LeftMenu.js | 27 ++++++++++++++++++- apps/spreadsheeteditor/main/app_dev.js | 2 ++ .../main/resources/less/leftmenu.less | 1 + 6 files changed, 39 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js index 18e1393c6..f68d2b4f7 100644 --- a/apps/spreadsheeteditor/main/app.js +++ b/apps/spreadsheeteditor/main/app.js @@ -152,6 +152,7 @@ require([ 'Print', 'Toolbar', 'Statusbar', + 'Spellcheck', 'RightMenu', 'LeftMenu', 'Main', @@ -174,6 +175,7 @@ require([ 'spreadsheeteditor/main/app/controller/CellEditor', 'spreadsheeteditor/main/app/controller/Toolbar', 'spreadsheeteditor/main/app/controller/Statusbar', + 'spreadsheeteditor/main/app/controller/Spellcheck', 'spreadsheeteditor/main/app/controller/RightMenu', 'spreadsheeteditor/main/app/controller/LeftMenu', 'spreadsheeteditor/main/app/controller/Main', diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 4667170d1..0498531af 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -202,6 +202,9 @@ define([ this.leftMenu.btnChat.hide(); this.leftMenu.btnComments.hide(); } + + this.leftMenu.setOptionsPanel('spellcheck', this.getApplication().getController('Spellcheck').getView('Spellcheck')); + this.mode.trialMode && this.leftMenu.setDeveloperMode(this.mode.trialMode); /** coauthoring end **/ Common.util.Shortcuts.resumeEvents(); @@ -646,6 +649,7 @@ define([ this.leftMenu.btnChat.setDisabled(true); /** coauthoring end **/ this.leftMenu.btnPlugins.setDisabled(true); + this.leftMenu.btnSpellcheck.setDisabled(true); this.leftMenu.getMenu('file').setMode({isDisconnected: true, enableDownload: !!enableDownload}); if ( this.dlgSearch ) { @@ -844,6 +848,7 @@ define([ this.leftMenu.btnAbout.setDisabled(isRangeSelection); this.leftMenu.btnSearch.setDisabled(isRangeSelection); + this.leftMenu.btnSpellcheck.setDisabled(isRangeSelection); if (this.mode.canPlugins && this.leftMenu.panelPlugins) { this.leftMenu.panelPlugins.setLocked(isRangeSelection); this.leftMenu.panelPlugins.disableControls(isRangeSelection); @@ -855,6 +860,7 @@ define([ this.leftMenu.btnAbout.setDisabled(isEditFormula); this.leftMenu.btnSearch.setDisabled(isEditFormula); + this.leftMenu.btnSpellcheck.setDisabled(isEditFormula); if (this.mode.canPlugins && this.leftMenu.panelPlugins) { this.leftMenu.panelPlugins.setLocked(isEditFormula); this.leftMenu.panelPlugins.disableControls(isEditFormula); diff --git a/apps/spreadsheeteditor/main/app/template/LeftMenu.template b/apps/spreadsheeteditor/main/app/template/LeftMenu.template index 95335821c..bc535469d 100644 --- a/apps/spreadsheeteditor/main/app/template/LeftMenu.template +++ b/apps/spreadsheeteditor/main/app/template/LeftMenu.template @@ -6,6 +6,7 @@ + @@ -13,6 +14,7 @@