From d9f90692d820782220d3b8daa6794b2b618f52a8 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 30 Jul 2019 11:12:26 +0300 Subject: [PATCH 1/5] [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 4e2f5fdaeebd41e7d30048dc85b266b31ea13a55 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 30 Jul 2019 16:08:24 +0300 Subject: [PATCH 3/5] [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 4/5] [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 1b81bc79f84707ab20271bd320ed8d433e65e314 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Wed, 31 Jul 2019 11:50:22 +0300 Subject: [PATCH 5/5] 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",