+
+
+ -
+
- + + +
- + + +
- + + +
',
+ '',
+ '
',
+ '',
+ ''
+ ].join('');
+
+ this.options.tpl = _.template(this.template)(this.options);
+ this.props = this.options.props;
+ this.handler = this.options.handler;
+
+ Common.UI.Window.prototype.initialize.call(this, this.options);
+ },
+ render: function () {
+ Common.UI.Window.prototype.render.call(this);
+
+ this.columnsList = new Common.UI.ListView({
+ el: $('#add-slicers-dlg-columns', this.$window),
+ store: new Common.UI.DataViewStore(),
+ simpleAddMode: true,
+ scrollAlwaysVisible: true,
+ template: _.template([''].join('')),
+ itemTemplate: _.template([
+ '',
+ '',
+ '
'
+ ].join(''))
+ });
+ this.columnsList.on({
+ 'item:change': this.onItemChanged.bind(this),
+ 'item:add': this.onItemChanged.bind(this),
+ 'item:select': this.onCellCheck.bind(this)
+ });
+ this.columnsList.onKeyDown = _.bind(this.onListKeyDown, this);
+
+ this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+ this.afterRender();
+ },
+
+ updateColumnsList: function(props) {
+ var arr = [];
+ if (props && props.length>0) {
+ this.props.forEach(function (item, index) {
+ arr.push(new Common.UI.DataViewModel({
+ id : index,
+ selected : false,
+ allowSelected : true,
+ value : item,
+ check : false
+ }));
+ });
+
+ this.columnsList.store.reset(arr);
+ this.columnsList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true});
+ }
+ },
+
+ onItemChanged: function (view, record) {
+ var state = record.model.get('check');
+ if ( state == 'indeterminate' )
+ $('input[type=checkbox]', record.$el).prop('indeterminate', true);
+ else $('input[type=checkbox]', record.$el).prop({checked: state, indeterminate: false});
+ },
+
+ onCellCheck: function (listView, itemView, record) {
+ if (this.checkCellTrigerBlock)
+ return;
+
+ var target = '', isLabel = false, bound = null;
+
+ var event = window.event ? window.event : window._event;
+ if (event) {
+ target = $(event.currentTarget).find('.list-item');
+
+ if (target.length) {
+ bound = target.get(0).getBoundingClientRect();
+ var _clientX = event.clientX*Common.Utils.zoom(),
+ _clientY = event.clientY*Common.Utils.zoom();
+ if (bound.left < _clientX && _clientX < bound.right &&
+ bound.top < _clientY && _clientY < bound.bottom) {
+ isLabel = true;
+ }
+ }
+
+ if (isLabel || event.target.className.match('checkbox')) {
+ this.updateCellCheck(listView, record);
+
+ _.delay(function () {
+ listView.$el.find('.listview').focus();
+ }, 100, this);
+ }
+ }
+ },
+
+ onListKeyDown: function (e, data) {
+ var record = null, listView = this.columnsList;
+
+ if (listView.disabled) return;
+ if (_.isUndefined(undefined)) data = e;
+
+ if (data.keyCode == Common.UI.Keys.SPACE) {
+ data.preventDefault();
+ data.stopPropagation();
+
+ this.updateCellCheck(listView, listView.getSelectedRec());
+
+ } else {
+ Common.UI.DataView.prototype.onKeyDown.call(this.columnsList, e, data);
+ }
+ },
+
+ updateCellCheck: function (listView, record) {
+ if (record && listView) {
+ record.set('check', !record.get('check'));
+ // listView.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true});
+ }
+ },
+
+ afterRender: function() {
+ this._setDefaults(this.props);
+ },
+
+ _setDefaults: function (props) {
+ if (props) {
+ this.updateColumnsList(props);
+ }
+ },
+
+ getSettings: function () {
+ var store = this.columnsList.store,
+ props = [];
+ store.each(function(item, index) {
+ item.get('check') && (props.push(item.get('value')));
+ });
+ return props;
+ },
+
+ onBtnClick: function(event) {
+ this._handleInput(event.currentTarget.attributes['result'].value);
+ },
+
+ onDblClickFormat: function () {
+ this._handleInput('ok');
+ },
+
+ onPrimary: function(event) {
+ this._handleInput('ok');
+ return false;
+ },
+
+ _handleInput: function(state) {
+ if (this.options.handler) {
+ this.options.handler.call(this, state, (state == 'ok') ? this.getSettings() : this.props);
+ }
+
+ this.close();
+ },
+
+ //
+ txtTitle: 'Insert Slicers',
+ textColumns: 'Columns'
+
+ }, SSE.Views.SlicerAddDialog || {}));
+});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/view/SlicerSettings.js b/apps/spreadsheeteditor/main/app/view/SlicerSettings.js
new file mode 100644
index 000000000..2614c95b2
--- /dev/null
+++ b/apps/spreadsheeteditor/main/app/view/SlicerSettings.js
@@ -0,0 +1,761 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2020
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+/**
+ * SlicerSettings.js
+ *
+ * Created by Julia Radzhabova on 5/26/20
+ * Copyright (c) 2020 Ascensio System SIA. All rights reserved.
+ *
+ */
+define([
+ 'text!spreadsheeteditor/main/app/template/SlicerSettings.template',
+ 'jquery',
+ 'underscore',
+ 'backbone',
+ 'common/main/lib/component/Button',
+ 'common/main/lib/component/MetricSpinner',
+ 'spreadsheeteditor/main/app/view/SlicerSettingsAdvanced'
+], function (menuTemplate, $, _, Backbone) {
+ 'use strict';
+
+ SSE.Views.SlicerSettings = Backbone.View.extend(_.extend({
+ el: '#id-slicer-settings',
+
+ // Compile our stats template
+ template: _.template(menuTemplate),
+
+ // Delegated events for creating new items, and clearing completed ones.
+ events: {
+ },
+
+ options: {
+ alias: 'SlicerSettings'
+ },
+
+ initialize: function () {
+ this._initSettings = true;
+
+ this._nRatio = 1;
+ this._state = {
+ Width: 0,
+ Height: 0,
+ DisabledControls: false,
+ keepRatio: false,
+ ColCount: 0,
+ ColWidth: 0,
+ ColHeight: 0,
+ PosVert: 0,
+ PosHor: 0,
+ PosLocked: false,
+ SortOrder: undefined,
+ IndNoData: false,
+ ShowNoData: false,
+ HideNoData: false,
+ DisabledSizeControls: false
+ };
+ this.spinners = [];
+ this.lockedControls = [];
+ this.sizeControls = [];
+ this._locked = false;
+
+ this._noApply = false;
+ this._originalProps = null;
+ this.styles = null;
+
+ this.render();
+ },
+
+ render: function () {
+ var el = $(this.el);
+ el.html(this.template({
+ scope: this
+ }));
+
+ this.linkAdvanced = $('#slicer-advanced-link');
+ },
+
+ setApi: function(api) {
+ if ( api == undefined ) return;
+ this.api = api;
+ this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
+ return this;
+ },
+
+ setMode: function(mode) {
+ this.mode = mode;
+ },
+
+ updateMetricUnit: function() {
+ if (this.spinners) {
+ for (var i=0; i',
+ '
',
+ '<%= Common.Utils.String.htmlEncode(value) %>
',
+ 'If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.txtMultiSelect": "Multi-Select (Alt+S)", + "SSE.Controllers.Main.txtClearFilter": "Clear Filter (Alt+C)", + "SSE.Controllers.Main.txtBlank": "(blank)", + "SSE.Controllers.Main.textHasMacros": "The file contains automatic macros.
Do you want to run macros?", + "SSE.Controllers.Main.textRemember": "Remember my choice", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textFirstCol": "First column", "SSE.Controllers.Print.textFirstRow": "First row", @@ -1255,6 +1260,9 @@ "SSE.Views.CellSettings.tipOuter": "Set outer border only", "SSE.Views.CellSettings.tipRight": "Set outer right border only", "SSE.Views.CellSettings.tipTop": "Set outer top border only", + "SSE.Views.CellSettings.textControl": "Text Control", + "SSE.Views.CellSettings.strWrap": "Wrap text", + "SSE.Views.CellSettings.strShrink": "Shrink to fit", "SSE.Views.ChartSettings.strLineWeight": "Line Weight", "SSE.Views.ChartSettings.strSparkColor": "Color", "SSE.Views.ChartSettings.strTemplate": "Template", @@ -1573,6 +1581,7 @@ "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", "SSE.Views.DocumentHolder.textFromStorage": "From Storage", + "SSE.Views.DocumentHolder.advancedSlicerText": "Slicer Advanced Settings", "SSE.Views.FieldSettingsDialog.strLayout": "Layout", "SSE.Views.FieldSettingsDialog.strSubtotals": "Subtotals", "SSE.Views.FieldSettingsDialog.textReport": "Report Form", @@ -1687,6 +1696,15 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strMacrosSettings": "Macros Settings", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Show Notification", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacros": "Enable All", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Disable All", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Disable all macros with notification", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Enable all macros without notification", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Disable all macros without notification", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strPaste": "Cut, copy and paste", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strPasteButton": "Show Paste Options button when content is pasted", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.okButtonText": "Apply", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strDictionaryLanguage": "Dictionary language", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsInUPPERCASE": "Ignore words in UPPERCASE", @@ -1753,6 +1771,11 @@ "SSE.Views.FormulaTab.txtFormulaTip": "Insert function", "SSE.Views.FormulaTab.txtMore": "More functions", "SSE.Views.FormulaTab.txtRecent": "Recently used", + "SSE.Views.FormulaWizard.textTitle": "Function Argumens", + "SSE.Views.FormulaWizard.textValue": "Formula result", + "SSE.Views.FormulaWizard.textFunctionRes": "Function result", + "SSE.Views.FormulaWizard.textFunction": "Function", + "SSE.Views.FormulaWizard.textHelp": "Help on this function", "SSE.Views.GroupDialog.textColumns": "Columns", "SSE.Views.GroupDialog.textRows": "Rows", "SSE.Views.HeaderFooterDialog.textAlign": "Align with page margins", @@ -2108,6 +2131,7 @@ "SSE.Views.RightMenu.txtSparklineSettings": "Sparkline Settings", "SSE.Views.RightMenu.txtTableSettings": "Table settings", "SSE.Views.RightMenu.txtTextArtSettings": "Text Art settings", + "SSE.Views.RightMenu.txtSlicerSettings": "Slicer Settings", "SSE.Views.ScaleDialog.textAuto": "Auto", "SSE.Views.ScaleDialog.textError": "The entered value is incorrect.", "SSE.Views.ScaleDialog.textFewPages": "pages", @@ -2231,6 +2255,71 @@ "SSE.Views.SignatureSettings.txtRequestedSignatures": "This spreadsheet needs to be signed.", "SSE.Views.SignatureSettings.txtSigned": "Valid signatures has been added to the spreadsheet. The spreadsheet is protected from editing.", "SSE.Views.SignatureSettings.txtSignedInvalid": "Some of the digital signatures in spreadsheet are invalid or could not be verified. The spreadsheet is protected from editing.", + "SSE.Views.SlicerAddDialog.txtTitle": "Insert Slicers", + "SSE.Views.SlicerAddDialog.textColumns": "Columns", + "SSE.Views.SlicerSettings.textKeepRatio": "Constant Proportions", + "SSE.Views.SlicerSettings.textSize": "Size", + "SSE.Views.SlicerSettings.textWidth": "Width", + "SSE.Views.SlicerSettings.textHeight": "Height", + "SSE.Views.SlicerSettings.textAdvanced": "Show advanced settings", + "SSE.Views.SlicerSettings.textPosition": "Position", + "SSE.Views.SlicerSettings.textHor": "Horizontal", + "SSE.Views.SlicerSettings.textVert": "Vertical", + "SSE.Views.SlicerSettings.textButtons": "Buttons", + "SSE.Views.SlicerSettings.textColumns": "Columns", + "SSE.Views.SlicerSettings.textStyle": "Style", + "SSE.Views.SlicerSettings.textLock": "Disable resizing or moving", + "SSE.Views.SlicerSettings.strSorting": "Sorting and filtering", + "SSE.Views.SlicerSettings.textAsc": "Ascending", + "SSE.Views.SlicerSettings.textDesc": "Descending", + "SSE.Views.SlicerSettings.textAZ": "A to Z", + "SSE.Views.SlicerSettings.textZA": "Z to A", + "SSE.Views.SlicerSettings.textOldNew": "oldest to newest", + "SSE.Views.SlicerSettings.textNewOld": "newest to oldest", + "SSE.Views.SlicerSettings.textSmallLarge": "smallest to largest", + "SSE.Views.SlicerSettings.textLargeSmall": "largest to smallest", + "SSE.Views.SlicerSettings.strHideNoData": "Hide items with no data", + "SSE.Views.SlicerSettings.strIndNoData": "Visually indicate items with no data", + "SSE.Views.SlicerSettings.strShowNoData": "Show items with no data last", + "SSE.Views.SlicerSettings.strShowDel": "Show items deleted from the data source", + "SSE.Views.SlicerSettingsAdvanced.textTitle": "Slicer - Advanced Settings", + "SSE.Views.SlicerSettingsAdvanced.textHeader": "Header", + "SSE.Views.SlicerSettingsAdvanced.strStyle": "Style", + "SSE.Views.SlicerSettingsAdvanced.strSize": "Size", + "SSE.Views.SlicerSettingsAdvanced.strWidth": "Width", + "SSE.Views.SlicerSettingsAdvanced.strHeight": "Height", + "SSE.Views.SlicerSettingsAdvanced.strButtons": "Buttons", + "SSE.Views.SlicerSettingsAdvanced.strColumns": "Columns", + "SSE.Views.SlicerSettingsAdvanced.textSort": "Sort", + "SSE.Views.SlicerSettingsAdvanced.textSourceName": "Source name", + "SSE.Views.SlicerSettingsAdvanced.textFormulaName": "Name to use in formulas", + "SSE.Views.SlicerSettingsAdvanced.textName": "Name", + "SSE.Views.SlicerSettingsAdvanced.strStyleSize": "Style & Size", + "SSE.Views.SlicerSettingsAdvanced.strSorting": "Sorting & Filtering", + "SSE.Views.SlicerSettingsAdvanced.strReferences": "References", + "SSE.Views.SlicerSettingsAdvanced.txtEmpty": "This field is required", + "SSE.Views.SlicerSettingsAdvanced.strShowHeader": "Display header", + "SSE.Views.SlicerSettingsAdvanced.textAsc": "Ascending", + "SSE.Views.SlicerSettingsAdvanced.textDesc": "Descending", + "SSE.Views.SlicerSettingsAdvanced.textAZ": "A to Z", + "SSE.Views.SlicerSettingsAdvanced.textZA": "Z to A", + "SSE.Views.SlicerSettingsAdvanced.textOldNew": "oldest to newest", + "SSE.Views.SlicerSettingsAdvanced.textNewOld": "newest to oldest", + "SSE.Views.SlicerSettingsAdvanced.textSmallLarge": "smallest to largest", + "SSE.Views.SlicerSettingsAdvanced.textLargeSmall": "largest to smallest", + "SSE.Views.SlicerSettingsAdvanced.strHideNoData": "Hide items with no data", + "SSE.Views.SlicerSettingsAdvanced.strIndNoData": "Visually indicate items with no data", + "SSE.Views.SlicerSettingsAdvanced.strShowNoData": "Show items with no data last", + "SSE.Views.SlicerSettingsAdvanced.strShowDel": "Show items deleted from the data source", + "SSE.Views.SlicerSettingsAdvanced.textAlt": "Alternative Text", + "SSE.Views.SlicerSettingsAdvanced.textAltTitle": "Title", + "SSE.Views.SlicerSettingsAdvanced.textAltDescription": "Description", + "SSE.Views.SlicerSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.", + "SSE.Views.SlicerSettingsAdvanced.textSnap": "Cell Snapping", + "SSE.Views.SlicerSettingsAdvanced.textAbsolute": "Don't move or size with cells", + "SSE.Views.SlicerSettingsAdvanced.textOneCell": "Move but don't size with cells", + "SSE.Views.SlicerSettingsAdvanced.textTwoCell": "Move and size with cells", + "SSE.Views.SlicerSettingsAdvanced.textKeepRatio": "Constant Proportions", "SSE.Views.SortDialog.errorEmpty": "All sort criteria must have a column or row specified.", "SSE.Views.SortDialog.errorMoreOneCol": "More than one column is selected.", "SSE.Views.SortDialog.errorMoreOneRow": "More than one row is selected.", @@ -2383,6 +2472,7 @@ "SSE.Views.TableSettings.textTemplate": "Select From Template", "SSE.Views.TableSettings.textTotal": "Total", "SSE.Views.TableSettings.warnLongOperation": "The operation you are about to perform might take rather much time to complete.
Are you sure you want to continue?", + "SSE.Views.TableSettings.textSlicer": "Insert slicer", "SSE.Views.TableSettingsAdvanced.textAlt": "Alternative Text", "SSE.Views.TableSettingsAdvanced.textAltDescription": "Description", "SSE.Views.TableSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.", @@ -2657,6 +2747,9 @@ "SSE.Views.Toolbar.txtTime": "Time", "SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells", "SSE.Views.Toolbar.txtYen": "¥ Yen", + "SSE.Views.Toolbar.textVertical": "Vertical Text", + "SSE.Views.Toolbar.capBtnInsSlicer": "Slicer", + "SSE.Views.Toolbar.tipInsertSlicer": "Insert slicer", "SSE.Views.Top10FilterDialog.textType": "Show", "SSE.Views.Top10FilterDialog.txtBottom": "Bottom", "SSE.Views.Top10FilterDialog.txtItems": "Item", diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/text-orient-vertical.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/text-orient-vertical.png new file mode 100644 index 000000000..d000dc432 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/text-orient-vertical.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/text-orient-vertical.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/text-orient-vertical.png new file mode 100644 index 000000000..bd523533e Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/text-orient-vertical.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-addcell.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-addcell.png index fd1b91837..9ae5e1abd 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-addcell.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-addcell.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-autofilter.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-autofilter.png index 5873cde3e..a93bded8f 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-autofilter.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-autofilter.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-border-style.png index e3c5a0c24..faa2e6477 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-border-style.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-border-style.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-clear-filter.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-clear-filter.png index 03ea81cb7..c954b75ad 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-clear-filter.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-clear-filter.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-currency-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-currency-style.png index f0ec99e9d..f76185b0e 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-currency-style.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-currency-style.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-decdecimal.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-decdecimal.png index 5e24d9f3f..84bee01a4 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-decdecimal.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-decdecimal.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-delcell.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-delcell.png index a96621296..9e53f69a9 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-delcell.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-delcell.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-formula.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-formula.png index e97ec2a0c..5e6588c47 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-formula.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-formula.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-function.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-function.png index 237fd38d1..1577e3b1b 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-function.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-function.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-incdecimal.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-incdecimal.png index 526644579..ccb1dea72 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-incdecimal.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-incdecimal.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-menu-cell.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-menu-cell.png index 6bd232b8d..93b8e8edf 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-menu-cell.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-menu-cell.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-menu-pivot.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-menu-pivot.png index e83913f9a..f1c73e7e2 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-menu-pivot.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-menu-pivot.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge.png index bb3833b4a..1cc79ff79 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-named-range.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-named-range.png index 1c82aa0b2..b3e68275e 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-named-range.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-named-range.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-percent-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-percent-style.png index df12adcb7..894c63017 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-percent-style.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-percent-style.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-down(ru).png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-down(ru).png index b75608325..2c40972d0 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-down(ru).png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-down(ru).png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-down.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-down.png index c7855a84d..28bc86203 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-down.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-down.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-up(ru).png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-up(ru).png index d7cb54d61..1989f3562 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-up(ru).png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-up(ru).png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-up.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-up.png index 7dbf0bb98..aeb9be99b 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-up.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-sort-up.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-wrap.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-wrap.png index 70bdfc7b4..2fe75c8e0 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-wrap.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-wrap.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-ccw.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-ccw.png index 7703888ab..c47dc0661 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-ccw.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-ccw.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-cw.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-cw.png index 106595e02..2ecb82e6a 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-cw.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-cw.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-vertical.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-vertical.png new file mode 100644 index 000000000..36e5a9a64 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/text-orient-vertical.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-slicer.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-slicer.png new file mode 100644 index 000000000..61c780644 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-slicer.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-slicer.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-slicer.png new file mode 100644 index 000000000..27398f4fc Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-slicer.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/text-orient-vertical.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/text-orient-vertical.png new file mode 100644 index 000000000..fb5020317 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/text-orient-vertical.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/btn-slicer.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/btn-slicer.png new file mode 100644 index 000000000..530e454a3 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/btn-slicer.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-slicer.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-slicer.png new file mode 100644 index 000000000..389f78334 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-slicer.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/text-orient-vertical.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/text-orient-vertical.png new file mode 100644 index 000000000..82d82e9cf Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/text-orient-vertical.png differ diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index 596b0f3a6..6dadc6928 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -224,8 +224,8 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - } .list-item > div:nth-child(1) { - width:70px; - padding-right: 5px; + width:65px; + padding-right: 0; display: inline-block; white-space: pre; overflow: hidden; @@ -235,9 +235,9 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - .listitem-icon { vertical-align: middle; - width: 16px; + width: 22px; height: 16px; - background-position: -1px -274px; + background-position: 1px -274px; display: inline-block; } } @@ -320,4 +320,16 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px - } } } -} \ No newline at end of file +} + +.sheet-template-slicer { + width: 56px; + height: 55px; +} + +.menu-slicer-template { + .item { + border: none; + .box-shadow(none); + } +} diff --git a/apps/spreadsheeteditor/mobile/app/controller/CellEditor.js b/apps/spreadsheeteditor/mobile/app/controller/CellEditor.js index cfec8afca..1e52d4a59 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/CellEditor.js +++ b/apps/spreadsheeteditor/mobile/app/controller/CellEditor.js @@ -67,7 +67,7 @@ define([ 'function:click': this.onInsertFunction.bind(this), 'function:hint': function (name, type) { setTimeout(function(){ - me.api.asc_insertFormula(name, type, false); + me.api.asc_insertInCell(name, type, false); }, 0); } } diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 927dc8965..21e802e98 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -243,6 +243,14 @@ define([ if (!me.editorConfig.customization || !(me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo)) $('#editor_sdk').append('
' + ''.repeat(2) + '
');
+
+ var value = Common.localStorage.getItem("sse-mobile-macros-mode");
+ if (value === null) {
+ value = this.editorConfig.customization ? this.editorConfig.customization.macrosMode : 'warn';
+ value = (value == 'enable') ? 1 : (value == 'disable' ? 2 : 0);
+ } else
+ value = parseInt(value);
+ Common.Utils.InternalSettings.set("sse-mobile-macros-mode", value);
},
loadDocument: function(data) {
@@ -270,10 +278,16 @@ define([
docInfo.put_Token(data.doc.token);
docInfo.put_Permissions(_permissions);
docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys);
+
+ var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false);
+ docInfo.asc_putIsEnabledMacroses(!!enable);
+ enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins!==false);
+ docInfo.asc_putIsEnabledPlugins(!!enable);
}
this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this));
this.api.asc_registerCallback('asc_onLicenseChanged', _.bind(this.onLicenseChanged, this));
+ this.api.asc_registerCallback('asc_onRunAutostartMacroses', _.bind(this.onRunAutostartMacroses, this));
this.api.asc_setDocInfo(docInfo);
this.api.asc_getEditorPermissions(this.editorConfig.licenseUrl, this.editorConfig.customerId);
@@ -1483,6 +1497,51 @@ define([
return false;
},
+ onRunAutostartMacroses: function() {
+ var me = this,
+ enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false);
+ if (enable) {
+ var value = Common.Utils.InternalSettings.get("sse-mobile-macros-mode");
+ if (value==1)
+ this.api.asc_runAutostartMacroses();
+ else if (value === 0) {
+ uiApp.modal({
+ title: this.notcriticalErrorTitle,
+ text: this.textHasMacros,
+ afterText: '',
+ buttons: [{
+ text: this.textYes,
+ onClick: function () {
+ var dontshow = $('input[name="checkbox-show-macros"]').prop('checked');
+ if (dontshow) {
+ Common.Utils.InternalSettings.set("sse-mobile-macros-mode", 1);
+ Common.localStorage.setItem("sse-mobile-macros-mode", 1);
+ }
+ setTimeout(function() {
+ me.api.asc_runAutostartMacroses();
+ }, 1);
+ }
+ },
+ {
+ text: this.textNo,
+ onClick: function () {
+ var dontshow = $('input[name="checkbox-show-macros"]').prop('checked');
+ if (dontshow) {
+ Common.Utils.InternalSettings.set("sse-mobile-macros-mode", 2);
+ Common.localStorage.setItem("sse-mobile-macros-mode", 2);
+ }
+ }
+ }]
+ });
+ }
+ }
+ },
+
leavePageText: '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.',
criticalErrorTitle: 'Error',
notcriticalErrorTitle: 'Warning',
@@ -1666,7 +1725,11 @@ define([
waitText: 'Please, wait...',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.Please contact your Document Server administrator for details.', errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.', - errorOpensource: 'Files can be opened for viewing only. Mobile web editors are not available in the Open Source version.' + errorOpensource: 'Files can be opened for viewing only. Mobile web editors are not available in the Open Source version.', + textHasMacros: 'The file contains automatic macros.
Do you want to run macros?', + textRemember: 'Remember my choice', + textYes: 'Yes', + textNo: 'No' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index 847826eed..dcea13ddf 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -258,6 +258,8 @@ define([ me.initRegSettings(); } else if ('#settings-info-view' == pageId) { me.initPageInfo(); + } else if ('#settings-macros-view' == pageId) { + me.initPageMacrosSettings(); } else { var _userCount = SSE.getController('Main').returnUserCount(); if (_userCount > 0) { @@ -266,6 +268,20 @@ define([ } }, + initPageMacrosSettings: function() { + var me = this, + $pageMacrosSettings = $('.page[data-page="settings-macros-view"] input:radio[name=macros-settings]'), + value = Common.Utils.InternalSettings.get("sse-mobile-macros-mode") || 0; + $pageMacrosSettings.single('change', _.bind(me.onChangeMacrosSettings, me)); + $pageMacrosSettings.val([value]); + }, + + onChangeMacrosSettings: function(e) { + var value = parseInt($(e.currentTarget).val()); + Common.Utils.InternalSettings.set("sse-mobile-macros-mode", value); + Common.localStorage.setItem("sse-mobile-macros-mode", value); + }, + initPageInfo: function() { var document = Common.SharedSettings.get('document') || {}, info = document.info || {}; diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js index bde23be46..869ebaed6 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js +++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js @@ -157,7 +157,7 @@ define([ }, onDoneComment: function(documentFlag) { - var value = $('#comment-text').val(); + var value = $('#comment-text').val().trim(); if (value.length > 0) { if (SSE.getController('Common.Controllers.Collaboration').onAddNewComment(value, documentFlag)) { this.view.isComments = true; diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js index 27d213da6..94c848f72 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js @@ -132,6 +132,8 @@ define([ me.initBorderColorPage(); } else if ('#edit-text-format' == pageId) { me.initTextFormat(); + } else if ('#edit-text-orientation' == pageId) { + me.initTextOrientation(); } else if ('#edit-border-style' == pageId) { me.initBorderStyle(); } else if (!_.isUndefined(pageId) && pageId.indexOf('#edit-cell-format') > -1) { @@ -339,6 +341,8 @@ define([ return; } + me.initTextOrientation(); + me.initTextFormat(); }, @@ -504,6 +508,49 @@ define([ return clr; }, + initTextOrientation: function() { + if (_.isUndefined(this._cellInfo)) return; + + var me = this, + $pageTextOrientation = $('.page[data-page=edit-text-orientation]'), + orientationStr = 'horizontal', + xfs = this._cellInfo.asc_getXfs(); + + var textAngle = xfs.asc_getAngle(); + + switch(textAngle) { + case 45: orientationStr = 'anglecount'; break; + case -45: orientationStr = 'angleclock'; break; + case 255: orientationStr = 'vertical'; break; + case 90: orientationStr = 'rotateup'; break; + case -90: orientationStr = 'rotatedown'; break; + case 0: orientationStr = 'horizontal'; break; + } + + $('#text-orientation .item-media i').removeClass().addClass(Common.Utils.String.format('icon icon-text-orientation-{0}', orientationStr)); + + if ($pageTextOrientation.length > 0) { + var $radioOrientation = $pageTextOrientation.find('input:radio[name=text-orientation]'); + $radioOrientation.val([orientationStr]); + $radioOrientation.single('change', _.bind(me.onTextOrientationChange, me)); + } + }, + + onTextOrientationChange: function(e) { + var $target = $(e.currentTarget), + value = $target.prop('value'); + var angle = 0; + switch (value) { + case 'anglecount': angle = 45; break; + case 'angleclock': angle = -45; break; + case 'vertical': angle = 255; break; + case 'rotateup': angle = 90; break; + case 'rotatedown': angle = -90; break; + } + if (this.api) + this.api.asc_setCellAngle(angle); + }, + textFonts: 'Fonts', textAuto: 'Auto', textPt: 'pt' diff --git a/apps/spreadsheeteditor/mobile/app/template/EditCell.template b/apps/spreadsheeteditor/mobile/app/template/EditCell.template index 765b5be16..3c4a872a2 100644 --- a/apps/spreadsheeteditor/mobile/app/template/EditCell.template +++ b/apps/spreadsheeteditor/mobile/app/template/EditCell.template @@ -55,6 +55,16 @@ +
+ <% if (!android) { %>
+
+ <% } %>
+
+
+ <%= scope.textTextOrientation %>
+
@@ -303,6 +313,121 @@
+
+
+
+
+
+
+
+
+
+
+ -
+
- + + +
- + + +
- + + +
- + + +
- + + +
- + + +
+
@@ -844,4 +857,55 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/mobile/app/view/Settings.js b/apps/spreadsheeteditor/mobile/app/view/Settings.js
index 2ec25b119..7ac8485b4 100644
--- a/apps/spreadsheeteditor/mobile/app/view/Settings.js
+++ b/apps/spreadsheeteditor/mobile/app/view/Settings.js
@@ -54,7 +54,8 @@ define([
canDownload = false,
canAbout = true,
canHelp = true,
- canPrint = false;
+ canPrint = false,
+ isShowMacros = true;
return {
// el: '.view-main',
@@ -126,6 +127,7 @@ define([
if (mode.customization) {
canHelp = (mode.customization.help!==false);
+ isShowMacros = (mode.customization.macros!==false);
}
},
@@ -143,6 +145,7 @@ define([
if (!canAbout) $layout.find('#settings-about').hide();
if (!canHelp) $layout.find('#settings-help').hide();
if (!canPrint) $layout.find('#settings-print').hide();
+ if (!isShowMacros) $layour.find('#settings-macros').hide();
return $layout.html();
}
@@ -173,6 +176,10 @@ define([
}
},
+ showMacros: function () {
+ this.showPage('#settings-macros-view');
+ },
+
showSetApp: function() {
this.showPage('#settings-application-view');
$('#language-formula').single('click', _.bind(this.showFormulaLanguage, this));
@@ -180,6 +187,9 @@ define([
if (!isEdit) {
$('.page[data-page=settings-application-view] .page-content > :not(.display-view)').hide();
}
+ if (isShowMacros) {
+ $('#settings-macros').single('click', _.bind(this.showMacros, this));
+ }
},
showFormulaLanguage: function () {
@@ -421,7 +431,14 @@ define([
textLastModified: 'Last Modified',
textLastModifiedBy: 'Last Modified By',
textUploaded: 'Uploaded',
- textLocation: 'Location'
+ textLocation: 'Location',
+ textMacrosSettings: 'Macros Settings',
+ textDisableAll: 'Disable All',
+ textDisableAllMacrosWithoutNotification: 'Disable all macros without notification',
+ textShowNotification: 'Show Notification',
+ textDisableAllMacrosWithNotification: 'Disable all macros with notification',
+ textEnableAll: 'Enable All',
+ textEnableAllMacrosWithoutNotification: 'Enable all macros without notification'
}
})(), SSE.Views.Settings || {}))
});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js
index 4d31ef663..27b035370 100644
--- a/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js
+++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js
@@ -166,6 +166,7 @@ define([
Common.Utils.addScrollIfNeed('.page[data-page=edit-border-style]', '.page[data-page=edit-border-style] .page-content');
Common.Utils.addScrollIfNeed('.page[data-page=edit-cell-format]', '.page[data-page=edit-cell-format] .page-content');
Common.Utils.addScrollIfNeed('.page[data-page=edit-text-format]', '.page[data-page=edit-text-format] .page-content');
+ Common.Utils.addScrollIfNeed('.page[data-page=edit-text-orientation]', '.page[data-page=edit-text-orientation] .page-content');
$(selectorsDynamicPage).single('click', _.bind(this.onItemClick, this));
},
@@ -422,7 +423,14 @@ define([
textCharacterItalic: 'I',
textCharacterUnderline: 'U',
textAddCustomColor: 'Add Custom Color',
- textCustomColor: 'Custom Color'
+ textCustomColor: 'Custom Color',
+ textTextOrientation: 'Text Orientation',
+ textHorizontalText: 'Horizontal Text',
+ textAngleCounterclockwise: 'Angle Counterclockwise',
+ textAngleClockwise: 'Angle Clockwise',
+ textVerticalText: 'Vertical Text',
+ textRotateTextUp: 'Rotate Text Up',
+ textRotateTextDown: 'Rotate Text Down'
}
})(), SSE.Views.EditCell || {}))
});
diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json
index 81a4904f7..f1718608d 100644
--- a/apps/spreadsheeteditor/mobile/locale/en.json
+++ b/apps/spreadsheeteditor/mobile/locale/en.json
@@ -312,6 +312,10 @@
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
+
+
+
+
+
+
+
+ -
+
- + + +
- + + +
- + + +
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.textHasMacros": "The file contains automatic macros.
Do you want to run macros?", + "SSE.Controllers.Main.textRemember": "Remember my choice", + "SSE.Controllers.Main.textYes": "Yes", + "SSE.Controllers.Main.textNo": "No", "SSE.Controllers.Search.textNoTextFound": "Text not found", "SSE.Controllers.Search.textReplaceAll": "Replace All", "SSE.Controllers.Settings.notcriticalErrorTitle": "Warning", @@ -428,6 +432,13 @@ "SSE.Views.EditCell.textTopBorder": "Top Border", "SSE.Views.EditCell.textWrapText": "Wrap Text", "SSE.Views.EditCell.textYen": "Yen", + "SSE.Views.EditCell.textTextOrientation": "Text Orientation", + "SSE.Views.EditCell.textHorizontalText": "Horizontal Text", + "SSE.Views.EditCell.textAngleCounterclockwise": "Angle Counterclockwise", + "SSE.Views.EditCell.textAngleClockwise": "Angle Clockwise", + "SSE.Views.EditCell.textVerticalText": "Vertical Text", + "SSE.Views.EditCell.textRotateTextUp": "Rotate Text Up", + "SSE.Views.EditCell.textRotateTextDown": "Rotate Text Down", "SSE.Views.EditChart.textAddCustomColor": "Add Custom Color", "SSE.Views.EditChart.textAuto": "Auto", "SSE.Views.EditChart.textAxisCrosses": "Axis Crosses", @@ -616,5 +627,12 @@ "SSE.Views.Settings.textUploaded": "Uploaded", "SSE.Views.Settings.textVersion": "Version", "SSE.Views.Settings.unknownText": "Unknown", + "SSE.Views.Settings.textMacrosSettings": "Macros Settings", + "SSE.Views.Settings.textDisableAll": "Disable All", + "SSE.Views.Settings.textDisableAllMacrosWithoutNotification": "Disable all macros without notification", + "SSE.Views.Settings.textShowNotification": "Show Notification", + "SSE.Views.Settings.textDisableAllMacrosWithNotification": "Disable all macros with notification", + "SSE.Views.Settings.textEnableAll": "Enable All", + "SSE.Views.Settings.textEnableAllMacrosWithoutNotification": "Enable all macros without notification", "SSE.Views.Toolbar.textBack": "Back" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index bdf003a6f..d29880080 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -6552,17 +6552,6 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after padding: 16px 0; word-wrap: break-word; } -.page-comments p, -.add-comment p, -.page-view-comments p, -.container-edit-comment p, -.container-add-reply p, -.page-edit-comment p, -.page-add-reply p, -.page-edit-reply p { - margin: 0; - word-break: break-word; -} .page-comments .list-reply, .add-comment .list-reply, .page-view-comments .list-reply, @@ -6658,6 +6647,24 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after max-width: 100%; padding-right: 15px; } +.page-comments .comment-text pre, +.add-comment .comment-text pre, +.page-view-comments .comment-text pre, +.container-edit-comment .comment-text pre, +.container-add-reply .comment-text pre, +.page-edit-comment .comment-text pre, +.page-add-reply .comment-text pre, +.page-edit-reply .comment-text pre, +.page-comments .reply-text pre, +.add-comment .reply-text pre, +.page-view-comments .reply-text pre, +.container-edit-comment .reply-text pre, +.container-add-reply .reply-text pre, +.page-edit-comment .reply-text pre, +.page-add-reply .reply-text pre, +.page-edit-reply .reply-text pre { + white-space: pre-wrap; +} .page-comments .reply-item, .add-comment .reply-item, .page-view-comments .reply-item, @@ -7435,6 +7442,36 @@ i.icon.icon-add-other { 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7.00049%2018C7.00049%2018.8284%206.32892%2019.5%205.50049%2019.5C4.67206%2019.5%204.00049%2018.8284%204.00049%2018C4.00049%2017.1716%204.67206%2016.5%205.50049%2016.5C6.32892%2016.5%207.00049%2017.1716%207.00049%2018ZM13.5005%2018C13.5005%2018.8284%2012.8289%2019.5%2012.0005%2019.5C11.1721%2019.5%2010.5005%2018.8284%2010.5005%2018C10.5005%2017.1716%2011.1721%2016.5%2012.0005%2016.5C12.8289%2016.5%2013.5005%2017.1716%2013.5005%2018ZM18.5005%2019.5C19.3289%2019.5%2020.0005%2018.8284%2020.0005%2018C20.0005%2017.1716%2019.3289%2016.5%2018.5005%2016.5C17.6721%2016.5%2017.0005%2017.1716%2017.0005%2018C17.0005%2018.8284%2017.6721%2019.5%2018.5005%2019.5Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-text-orientation-horizontal { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M9.51367%2010.75H11.269L8.06905%202H6.36276L3.25%2010.75H4.96174L5.62136%208.76245H8.81589L9.51367%2010.75ZM7.19682%204.04127L8.29801%207.2882H6.11744L7.19682%204.04127ZM16.0002%202H12.8057V10.75H15.5259C16.5544%2010.742%2017.2031%2010.7221%2017.4721%2010.6903C17.9009%2010.6386%2018.2607%2010.5013%2018.5515%2010.2785C18.8458%2010.0517%2019.0766%209.75125%2019.2438%209.37722C19.4146%208.9992%2019.5%208.61124%2019.5%208.21334C19.5%207.70799%2019.3692%207.2683%2019.1075%206.89427C18.8458%206.52024%2018.4715%206.25563%2017.9845%206.10044C18.3298%205.92934%2018.6023%205.67269%2018.8022%205.33049C19.0057%204.98829%2019.1075%204.61227%2019.1075%204.20242C19.1075%203.82441%2019.0257%203.4842%2018.8622%203.18179C18.6986%202.8754%2018.4933%202.63068%2018.2462%202.44765C18.0027%202.26461%2017.7247%202.14524%2017.4121%202.08953C17.1032%202.02984%2016.6326%202%2016.0002%202ZM14.4193%205.47971L14.4193%203.45634L15.346%203.45634C16.1056%203.45634%2016.5653%203.46629%2016.7252%203.48619C16.9942%203.522%2017.1959%203.62545%2017.3303%203.79656C17.4684%203.96368%2017.5375%204.18253%2017.5375%204.4531C17.5375%204.73562%2017.4575%204.96442%2017.2976%205.1395C17.1414%205.3106%2016.9251%205.41405%2016.6489%205.44986C16.4963%205.46976%2016.1056%205.47971%2015.4769%205.47971H14.4193ZM14.4193%209.27575V6.93605H15.7222C16.4563%206.93605%2016.9324%206.97783%2017.1504%207.06139C17.3721%207.14495%2017.5411%207.27825%2017.6574%207.46129C17.7737%207.64433%2017.8319%207.86716%2017.8319%208.12977C17.8319%208.44014%2017.7555%208.68884%2017.6029%208.87585C17.4539%209.05889%2017.2595%209.17428%2017.0196%209.22203C16.8633%209.25784%2016.4945%209.27575%2015.913%209.27575H14.4193ZM17.9829%2013.25L21.5023%2017.0829L22%2017.625L21.5023%2018.1671L17.9829%2022L16.9875%2020.9159L19.3053%2018.3916H2V16.8584H19.3053L16.9875%2014.3341L17.9829%2013.25Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-text-orientation-anglecount { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M22%208.71927H16.3964V10.0783L19.7586%2010.0783L8.55143%2020.9162L9.67214%2022L20.597%2011.1439V14.4301L22%2014.4301V8.71927Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M10.6577%2011.3859L9.54484%2012.462L7.84242%2011.6713L5.81718%2013.6298L6.65905%2015.2527L5.57385%2016.3022L2%209.02933L3.08174%207.98323L10.6577%2011.3859ZM6.57946%2011.085L3.82288%209.76944L5.19705%2012.4218L6.57946%2011.085Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M6.08463%205.07929L8.10987%203.12078C8.51077%202.73309%208.82806%202.46285%209.06174%202.31005C9.2952%202.15259%209.54714%202.05532%209.81755%202.01826C10.0903%201.97896%2010.3756%202.0031%2010.6735%202.09068C10.9689%202.17582%2011.2364%202.33426%2011.4761%202.56602C11.7359%202.81728%2011.9098%203.1102%2011.9977%203.44478C12.0879%203.77712%2012.0778%204.10158%2011.9674%204.41815C12.3746%204.21472%2012.7796%204.14745%2013.1826%204.21634C13.5857%204.28523%2013.9473%204.47458%2014.2677%204.7844C14.52%205.02835%2014.7118%205.31856%2014.8432%205.65504C14.9743%205.98684%2015.0185%206.31251%2014.9756%206.63204C14.9326%206.9469%2014.7915%207.25165%2014.5524%207.54628C14.4021%207.73067%2014.0034%208.14059%2013.3564%208.77602L11.6319%2010.4438L6.08463%205.07929ZM8.03089%204.98287L9.31365%206.22336L9.98412%205.57498C10.3827%205.18952%2010.6241%204.94389%2010.7083%204.83812C10.8607%204.64682%2010.9322%204.45082%2010.9228%204.25012C10.9131%204.04474%2010.8188%203.85545%2010.6397%203.68225C10.4681%203.51636%2010.2856%203.42452%2010.0921%203.40673C9.89838%203.38427%209.70492%203.44451%209.51172%203.58743C9.39773%203.67327%209.09996%203.94903%208.61842%204.4147L8.03089%204.98287ZM10.2369%207.11622L11.7202%208.55065L12.6672%207.63489C13.0358%207.2784%2013.2583%207.04126%2013.3347%206.9235C13.4565%206.74717%2013.5066%206.55722%2013.485%206.35365C13.4632%206.14541%2013.354%205.94616%2013.1572%205.75587C12.9907%205.59487%2012.8126%205.4939%2012.6228%205.45299C12.433%205.41207%2012.2414%205.43395%2012.0479%205.51864C11.8567%205.60109%2011.5283%205.86736%2011.0629%206.31744L10.2369%207.11622Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-text-orientation-angleclock { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.2807%2022L15.2807%2016.3964L13.9217%2016.3964L13.9217%2019.7586L3.08379%208.55143L2%209.67214L12.8561%2020.597L9.56995%2020.597L9.56994%2022L15.2807%2022Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M12.6141%2010.6577L11.538%209.54484L12.3287%207.84242L10.3702%205.81718L8.74726%206.65905L7.69782%205.57385L14.9707%202L16.0168%203.08174L12.6141%2010.6577ZM12.915%206.57946L14.2306%203.82288L11.5782%205.19705L12.915%206.57946Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M18.9207%206.08463L20.8792%208.10987C21.2669%208.51077%2021.5372%208.82806%2021.6899%209.06174C21.8474%209.2952%2021.9447%209.54714%2021.9817%209.81755C22.021%2010.0903%2021.9969%2010.3756%2021.9093%2010.6735C21.8242%2010.9689%2021.6657%2011.2364%2021.434%2011.4761C21.1827%2011.7359%2020.8898%2011.9098%2020.5552%2011.9977C20.2229%2012.0879%2019.8984%2012.0778%2019.5819%2011.9674C19.7853%2012.3746%2019.8525%2012.7796%2019.7837%2013.1826C19.7148%2013.5857%2019.5254%2013.9473%2019.2156%2014.2677C18.9716%2014.52%2018.6814%2014.7118%2018.345%2014.8432C18.0132%2014.9743%2017.6875%2015.0185%2017.368%2014.9756C17.0531%2014.9326%2016.7484%2014.7915%2016.4537%2014.5524C16.2693%2014.4021%2015.8594%2014.0034%2015.224%2013.3564L13.5562%2011.6319L18.9207%206.08463ZM19.0171%208.03089L17.7766%209.31365L18.425%209.98412C18.8105%2010.3827%2019.0561%2010.6241%2019.1619%2010.7083C19.3532%2010.8607%2019.5492%2010.9322%2019.7499%2010.9228C19.9553%2010.9131%2020.1445%2010.8188%2020.3178%2010.6397C20.4836%2010.4681%2020.5755%2010.2856%2020.5933%2010.0921C20.6157%209.89838%2020.5555%209.70492%2020.4126%209.51172C20.3267%209.39773%2020.051%209.09996%2019.5853%208.61842L19.0171%208.03089ZM16.8838%2010.2369L15.4494%2011.7202L16.3651%2012.6672C16.7216%2013.0358%2016.9587%2013.2583%2017.0765%2013.3347C17.2528%2013.4565%2017.4428%2013.5066%2017.6463%2013.485C17.8546%2013.4632%2018.0538%2013.354%2018.2441%2013.1572C18.4051%2012.9907%2018.5061%2012.8126%2018.547%2012.6228C18.5879%2012.433%2018.566%2012.2414%2018.4814%2012.0479C18.3989%2011.8567%2018.1326%2011.5283%2017.6826%2011.0629L16.8838%2010.2369Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-text-orientation-vertical { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7.10359%2022.0648L11.0819%2018.5454L9.95669%2017.55L7.33664%2019.8678L7.33664%201.9375L5.7453%201.9375L5.7453%2019.8678L3.12525%2017.55L2%2018.5454L5.97834%2022.0648L6.54097%2022.5625L7.10359%2022.0648Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M14.513%2013.1875L17.8287%2013.1875C18.4851%2013.1875%2018.9736%2013.2173%2019.2942%2013.277C19.6186%2013.3327%2019.9072%2013.4521%2020.1599%2013.6351C20.4164%2013.8182%2020.6295%2014.0629%2020.7993%2014.3693C20.969%2014.6717%2021.0539%2015.0119%2021.0539%2015.3899C21.0539%2015.7998%2020.9483%2016.1758%2020.737%2016.518C20.5296%2016.8602%2020.2467%2017.1168%2019.8883%2017.2879C20.3938%2017.4431%2020.7823%2017.7077%2021.0539%2018.0818C21.3255%2018.4558%2021.4613%2018.8955%2021.4613%2019.4008C21.4613%2019.7987%2021.3726%2020.1867%2021.1954%2020.5647C21.0218%2020.9387%2020.7823%2021.2392%2020.4768%2021.466C20.175%2021.6888%2019.8015%2021.8261%2019.3564%2021.8778C19.0773%2021.9096%2018.404%2021.9295%2017.3365%2021.9375L14.513%2021.9375L14.513%2013.1875ZM16.1878%2014.6438L16.1878%2016.6672L17.2855%2016.6672C17.9381%2016.6672%2018.3436%2016.6573%2018.502%2016.6374C18.7887%2016.6016%2019.0132%2016.4981%2019.1754%2016.327C19.3413%2016.1519%2019.4243%2015.9231%2019.4243%2015.6406C19.4243%2015.37%2019.3527%2015.1512%2019.2093%2014.9841C19.0697%2014.813%2018.8604%2014.7095%2018.5813%2014.6737C18.4153%2014.6538%2017.9381%2014.6438%2017.1497%2014.6438L16.1878%2014.6438ZM16.1878%2018.1235L16.1878%2020.4632L17.7382%2020.4632C18.3417%2020.4632%2018.7246%2020.4453%2018.8868%2020.4095C19.1358%2020.3618%2019.3376%2020.2464%2019.4922%2020.0634C19.6507%2019.8763%2019.7299%2019.6276%2019.7299%2019.3173C19.7299%2019.0547%2019.6695%2018.8318%2019.5488%2018.6488C19.4281%2018.4658%2019.2527%2018.3325%2019.0226%2018.2489C18.7963%2018.1653%2018.3021%2018.1235%2017.5401%2018.1235L16.1878%2018.1235Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2010.6875L20.1781%2010.6875L19.4538%208.69995L16.1381%208.69995L15.4534%2010.6875L13.6768%2010.6875L16.9076%201.9375L18.6786%201.9375L22%2010.6875ZM18.9163%207.2257L17.7733%203.97877L16.653%207.2257L18.9163%207.2257Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-text-orientation-rotateup { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5.9142%202.48263L2%205.89535L3.1071%206.86061L5.68491%204.61307L5.68491%2022L7.25059%2022L7.25059%204.61307L9.82839%206.86061L10.9355%205.89535L7.0213%202.48263L6.46775%202L5.9142%202.48263Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M21.9277%2012.5942L21.8993%2014.2496L19.9679%2014.9391L19.9162%2017.9517L21.8256%2018.5424L21.7979%2020.1567L13.3952%2017.3594L13.4228%2015.7502L21.9277%2012.5942ZM18.5353%2015.4508L15.3807%2016.5406L18.5%2017.5072L18.5353%2015.4508Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M13.4994%2011.0787L13.5511%208.06604C13.5614%207.46968%2013.5978%207.02537%2013.6605%206.7331C13.7194%206.43747%2013.8392%206.1734%2014.0199%205.94087C14.2008%205.70492%2014.4405%205.50741%2014.7391%205.34834C15.0339%205.18933%2015.3639%205.10684%2015.7291%205.10087C16.1251%205.0944%2016.4867%205.18442%2016.814%205.37095C17.1413%205.55405%2017.3849%205.80704%2017.5446%206.12994C17.7024%205.66822%2017.9641%205.31103%2018.3296%205.05835C18.6952%204.80567%2019.1221%204.67534%2019.6103%204.66736C19.9947%204.66107%2020.3681%204.73549%2020.7306%204.8906C21.0892%205.04235%2021.3757%205.25524%2021.59%205.52927C21.8006%205.79994%2021.9274%206.13708%2021.9704%206.54069C21.9968%206.79381%2022.0056%207.40527%2021.9966%208.37509V11.0787H13.4994ZM14.9325%209.53393L16.8872%209.50197L16.9043%208.50461C16.9145%207.91168%2016.9112%207.5434%2016.8945%207.39976C16.8643%207.13985%2016.7679%206.93756%2016.6051%206.79289C16.4386%206.64485%2016.2188%206.57306%2015.9459%206.57752C15.6845%206.5818%2015.472%206.65037%2015.3083%206.78325C15.1408%206.91277%2015.0376%207.10462%2014.9986%207.35881C14.9768%207.50993%2014.9598%207.94364%2014.9475%208.65996L14.9325%209.53393ZM18.2941%209.47896L20.5545%209.442L20.5786%208.03336C20.588%207.48499%2020.5767%207.1374%2020.5446%206.99059C20.5024%206.76514%2020.3941%206.58359%2020.2196%206.44597C20.0414%206.30497%2019.8024%206.23693%2019.5026%206.24183C19.2489%206.24598%2019.0327%206.30434%2018.854%206.4169C18.6753%206.52947%2018.5437%206.69095%2018.4594%206.90133C18.3752%207.10829%2018.3271%207.55794%2018.3152%208.25026L18.2941%209.47896Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-text-orientation-rotatedown { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7.0213%2021.5174L10.9355%2018.1047L9.82839%2017.1394L7.25058%2019.3869L7.25059%202L5.68491%202L5.68491%2019.3869L3.1071%2017.1394L2%2018.1047L5.91419%2021.5174L6.46774%2022L7.0213%2021.5174Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M13.4675%2011.4058L13.4959%209.75035L15.4273%209.06091L15.479%206.04827L13.5695%205.45761L13.5972%203.84333L22%206.64062L21.9724%208.24976L13.4675%2011.4058ZM16.8599%208.54922L20.0145%207.45944L16.8952%206.49282L16.8599%208.54922Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M21.8957%2012.9213L21.844%2015.934C21.8338%2016.5303%2021.7974%2016.9746%2021.7347%2017.2669C21.6758%2017.5625%2021.556%2017.8266%2021.3752%2018.0591C21.1944%2018.2951%2020.9547%2018.4926%2020.656%2018.6517C20.3612%2018.8107%2020.0312%2018.8932%2019.6661%2018.8991C19.2701%2018.9056%2018.9085%2018.8156%2018.5812%2018.6291C18.2538%2018.446%2018.0103%2018.193%2017.8506%2017.8701C17.6928%2018.3318%2017.4311%2018.689%2017.0655%2018.9417C16.7%2019.1943%2016.2731%2019.3247%2015.7849%2019.3326C15.4005%2019.3389%2015.0271%2019.2645%2014.6646%2019.1094C14.306%2018.9577%2014.0195%2018.7448%2013.8051%2018.4707C13.5946%2018.2001%2013.4678%2017.8629%2013.4248%2017.4593C13.3984%2017.2062%2013.3896%2016.5947%2013.3986%2015.6249L13.3986%2012.9213L21.8957%2012.9213ZM20.4627%2014.4661L18.508%2014.498L18.4909%2015.4954C18.4807%2016.0883%2018.484%2016.4566%2018.5007%2016.6002C18.5309%2016.8601%2018.6273%2017.0624%2018.7901%2017.2071C18.9566%2017.3552%2019.1764%2017.4269%2019.4493%2017.4225C19.7107%2017.4182%2019.9232%2017.3496%2020.0869%2017.2167C20.2544%2017.0872%2020.3576%2016.8954%2020.3965%2016.6412C20.4184%2016.4901%2020.4354%2016.0564%2020.4477%2015.34L20.4627%2014.4661ZM17.101%2014.521L14.8407%2014.558L14.8166%2015.9666C14.8071%2016.515%2014.8185%2016.8626%2014.8505%2017.0094C14.8928%2017.2349%2015.0011%2017.4164%2015.1755%2017.554C15.3537%2017.695%2015.5928%2017.7631%2015.8926%2017.7582C16.1463%2017.754%2016.3625%2017.6957%2016.5412%2017.5831C16.7199%2017.4705%2016.8514%2017.3091%2016.9358%2017.0987C17.02%2016.8917%2017.0681%2016.4421%2017.08%2015.7497L17.101%2014.521Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} .active i.icon.icon-add-chart { width: 24px; height: 24px; @@ -8306,3 +8343,10 @@ html.pixel-ratio-3 .cell-styles.dataview .row li { .picker-modal.container-view-comment .pages { background-color: #FFFFFF; } +.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-title { + font-weight: normal; +} +.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-subtitle { + font-size: 14px; + color: #8e8e93; +} diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index 47dd60a12..bbe6c5a4b 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -6139,17 +6139,6 @@ html.phone .document-menu .list-block .item-link { .page-edit-reply .list-block .item-inner:after { content: none; } -.page-comments p, -.page-add-comment p, -.page-view-comments p, -.container-edit-comment p, -.container-add-reply p, -.page-edit-comment p, -.page-add-reply p, -.page-edit-reply p { - margin: 0; - word-break: break-word; -} .page-comments .list-reply, .page-add-comment .list-reply, .page-view-comments .list-reply, @@ -6244,6 +6233,24 @@ html.phone .document-menu .list-block .item-link { max-width: 100%; padding-right: 15px; } +.page-comments .comment-text pre, +.page-add-comment .comment-text pre, +.page-view-comments .comment-text pre, +.container-edit-comment .comment-text pre, +.container-add-reply .comment-text pre, +.page-edit-comment .comment-text pre, +.page-add-reply .comment-text pre, +.page-edit-reply .comment-text pre, +.page-comments .reply-text pre, +.page-add-comment .reply-text pre, +.page-view-comments .reply-text pre, +.container-edit-comment .reply-text pre, +.container-add-reply .reply-text pre, +.page-edit-comment .reply-text pre, +.page-add-reply .reply-text pre, +.page-edit-reply .reply-text pre { + white-space: pre-wrap; +} .page-comments .reply-item, .page-add-comment .reply-item, .page-view-comments .reply-item, @@ -7126,6 +7133,36 @@ i.icon.icon-done-comment-white { 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%22M9%2016.1719L19.5938%205.57812L21%206.98438L9%2018.9844L3.42188%2013.4062L4.82812%2012L9%2016.1719Z%22%20fill%3D%22%23FFFFFF%22%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-text-orientation-horizontal { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M9.51367%2010.75H11.269L8.06905%202H6.36276L3.25%2010.75H4.96174L5.62136%208.76245H8.81589L9.51367%2010.75ZM7.19682%204.04127L8.29801%207.2882H6.11744L7.19682%204.04127ZM16.0002%202H12.8057V10.75H15.5259C16.5544%2010.742%2017.2031%2010.7221%2017.4721%2010.6903C17.9009%2010.6386%2018.2607%2010.5013%2018.5515%2010.2785C18.8458%2010.0517%2019.0766%209.75125%2019.2438%209.37722C19.4146%208.9992%2019.5%208.61124%2019.5%208.21334C19.5%207.70799%2019.3692%207.2683%2019.1075%206.89427C18.8458%206.52024%2018.4715%206.25563%2017.9845%206.10044C18.3298%205.92934%2018.6023%205.67269%2018.8022%205.33049C19.0057%204.98829%2019.1075%204.61227%2019.1075%204.20242C19.1075%203.82441%2019.0257%203.4842%2018.8622%203.18179C18.6986%202.8754%2018.4933%202.63068%2018.2462%202.44765C18.0027%202.26461%2017.7247%202.14524%2017.4121%202.08953C17.1032%202.02984%2016.6326%202%2016.0002%202ZM14.4193%205.47971L14.4193%203.45634L15.346%203.45634C16.1056%203.45634%2016.5653%203.46629%2016.7252%203.48619C16.9942%203.522%2017.1959%203.62545%2017.3303%203.79656C17.4684%203.96368%2017.5375%204.18253%2017.5375%204.4531C17.5375%204.73562%2017.4575%204.96442%2017.2976%205.1395C17.1414%205.3106%2016.9251%205.41405%2016.6489%205.44986C16.4963%205.46976%2016.1056%205.47971%2015.4769%205.47971H14.4193ZM14.4193%209.27575V6.93605H15.7222C16.4563%206.93605%2016.9324%206.97783%2017.1504%207.06139C17.3721%207.14495%2017.5411%207.27825%2017.6574%207.46129C17.7737%207.64433%2017.8319%207.86716%2017.8319%208.12977C17.8319%208.44014%2017.7555%208.68884%2017.6029%208.87585C17.4539%209.05889%2017.2595%209.17428%2017.0196%209.22203C16.8633%209.25784%2016.4945%209.27575%2015.913%209.27575H14.4193ZM17.9829%2013.25L21.5023%2017.0829L22%2017.625L21.5023%2018.1671L17.9829%2022L16.9875%2020.9159L19.3053%2018.3916H2V16.8584H19.3053L16.9875%2014.3341L17.9829%2013.25Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-text-orientation-anglecount { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M22%208.71927H16.3964V10.0783L19.7586%2010.0783L8.55142%2020.9162L9.67214%2022L20.597%2011.1439V14.4301L22%2014.4301V8.71927Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M10.6577%2011.3859L9.54484%2012.462L7.84242%2011.6713L5.81718%2013.6298L6.65905%2015.2527L5.57385%2016.3022L2%209.02933L3.08174%207.98323L10.6577%2011.3859ZM6.57946%2011.085L3.82288%209.76944L5.19705%2012.4218L6.57946%2011.085Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M6.08462%205.07929L8.10986%203.12078C8.51077%202.73309%208.82806%202.46285%209.06174%202.31005C9.2952%202.15259%209.54714%202.05532%209.81755%202.01826C10.0903%201.97896%2010.3756%202.0031%2010.6735%202.09068C10.9689%202.17582%2011.2364%202.33426%2011.4761%202.56602C11.7359%202.81728%2011.9098%203.1102%2011.9977%203.44478C12.0879%203.77712%2012.0778%204.10158%2011.9674%204.41815C12.3746%204.21472%2012.7796%204.14745%2013.1826%204.21634C13.5857%204.28523%2013.9473%204.47458%2014.2677%204.7844C14.52%205.02835%2014.7118%205.31856%2014.8432%205.65504C14.9743%205.98684%2015.0184%206.31251%2014.9756%206.63204C14.9326%206.9469%2014.7915%207.25165%2014.5524%207.54628C14.4021%207.73067%2014.0034%208.14059%2013.3564%208.77602L11.6319%2010.4438L6.08462%205.07929ZM8.03089%204.98287L9.31365%206.22336L9.98412%205.57498C10.3827%205.18952%2010.6241%204.94389%2010.7082%204.83812C10.8607%204.64682%2010.9322%204.45082%2010.9228%204.25012C10.9131%204.04474%2010.8188%203.85545%2010.6397%203.68225C10.4681%203.51636%2010.2856%203.42452%2010.0921%203.40673C9.89838%203.38427%209.70492%203.44451%209.51172%203.58743C9.39773%203.67327%209.09996%203.94903%208.61842%204.4147L8.03089%204.98287ZM10.2369%207.11622L11.7202%208.55065L12.6672%207.63489C13.0358%207.2784%2013.2583%207.04126%2013.3347%206.9235C13.4565%206.74717%2013.5066%206.55722%2013.485%206.35365C13.4632%206.14541%2013.354%205.94616%2013.1572%205.75587C12.9907%205.59487%2012.8126%205.4939%2012.6228%205.45299C12.433%205.41207%2012.2414%205.43395%2012.0479%205.51864C11.8567%205.60109%2011.5283%205.86736%2011.0629%206.31744L10.2369%207.11622Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-text-orientation-angleclock { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.2807%2022L15.2807%2016.3964L13.9217%2016.3964L13.9217%2019.7586L3.08379%208.55143L2%209.67214L12.8561%2020.597L9.56995%2020.597L9.56994%2022L15.2807%2022Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M12.6141%2010.6577L11.538%209.54484L12.3287%207.84242L10.3702%205.81718L8.74726%206.65905L7.69782%205.57385L14.9707%202L16.0168%203.08174L12.6141%2010.6577ZM12.915%206.57946L14.2306%203.82288L11.5782%205.19705L12.915%206.57946Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M18.9207%206.08463L20.8792%208.10987C21.2669%208.51077%2021.5372%208.82806%2021.6899%209.06174C21.8474%209.2952%2021.9447%209.54714%2021.9817%209.81755C22.021%2010.0903%2021.9969%2010.3756%2021.9093%2010.6735C21.8242%2010.9689%2021.6657%2011.2364%2021.434%2011.4761C21.1827%2011.7359%2020.8898%2011.9098%2020.5552%2011.9977C20.2229%2012.0879%2019.8984%2012.0778%2019.5819%2011.9674C19.7853%2012.3746%2019.8525%2012.7796%2019.7837%2013.1826C19.7148%2013.5857%2019.5254%2013.9473%2019.2156%2014.2677C18.9716%2014.52%2018.6814%2014.7118%2018.345%2014.8432C18.0132%2014.9743%2017.6875%2015.0185%2017.368%2014.9756C17.0531%2014.9326%2016.7484%2014.7915%2016.4537%2014.5524C16.2693%2014.4021%2015.8594%2014.0034%2015.224%2013.3564L13.5562%2011.6319L18.9207%206.08463ZM19.0171%208.03089L17.7766%209.31365L18.425%209.98412C18.8105%2010.3827%2019.0561%2010.6241%2019.1619%2010.7083C19.3532%2010.8607%2019.5492%2010.9322%2019.7499%2010.9228C19.9553%2010.9131%2020.1445%2010.8188%2020.3178%2010.6397C20.4836%2010.4681%2020.5755%2010.2856%2020.5933%2010.0921C20.6157%209.89838%2020.5555%209.70492%2020.4126%209.51172C20.3267%209.39773%2020.051%209.09996%2019.5853%208.61842L19.0171%208.03089ZM16.8838%2010.2369L15.4494%2011.7202L16.3651%2012.6672C16.7216%2013.0358%2016.9587%2013.2583%2017.0765%2013.3347C17.2528%2013.4565%2017.4428%2013.5066%2017.6463%2013.485C17.8546%2013.4632%2018.0538%2013.354%2018.2441%2013.1572C18.4051%2012.9907%2018.5061%2012.8126%2018.547%2012.6228C18.5879%2012.433%2018.566%2012.2414%2018.4814%2012.0479C18.3989%2011.8567%2018.1326%2011.5283%2017.6826%2011.0629L16.8838%2010.2369Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-text-orientation-vertical { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7.10359%2022.0648L11.0819%2018.5454L9.95669%2017.55L7.33664%2019.8678L7.33664%201.9375L5.7453%201.9375L5.7453%2019.8678L3.12525%2017.55L2%2018.5454L5.97834%2022.0648L6.54097%2022.5625L7.10359%2022.0648Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M14.513%2013.1875L17.8287%2013.1875C18.4851%2013.1875%2018.9736%2013.2173%2019.2942%2013.277C19.6186%2013.3327%2019.9072%2013.4521%2020.1599%2013.6351C20.4164%2013.8182%2020.6295%2014.0629%2020.7993%2014.3693C20.969%2014.6717%2021.0539%2015.0119%2021.0539%2015.3899C21.0539%2015.7998%2020.9483%2016.1758%2020.737%2016.518C20.5296%2016.8602%2020.2467%2017.1168%2019.8883%2017.2879C20.3938%2017.4431%2020.7823%2017.7077%2021.0539%2018.0818C21.3255%2018.4558%2021.4613%2018.8955%2021.4613%2019.4008C21.4613%2019.7987%2021.3726%2020.1867%2021.1954%2020.5647C21.0218%2020.9387%2020.7823%2021.2392%2020.4768%2021.466C20.175%2021.6888%2019.8015%2021.8261%2019.3564%2021.8778C19.0773%2021.9096%2018.404%2021.9295%2017.3365%2021.9375L14.513%2021.9375L14.513%2013.1875ZM16.1878%2014.6438L16.1878%2016.6672L17.2855%2016.6672C17.9381%2016.6672%2018.3436%2016.6573%2018.502%2016.6374C18.7887%2016.6016%2019.0132%2016.4981%2019.1754%2016.327C19.3413%2016.1519%2019.4243%2015.9231%2019.4243%2015.6406C19.4243%2015.37%2019.3527%2015.1512%2019.2093%2014.9841C19.0697%2014.813%2018.8604%2014.7095%2018.5813%2014.6737C18.4153%2014.6538%2017.9381%2014.6438%2017.1497%2014.6438L16.1878%2014.6438ZM16.1878%2018.1235L16.1878%2020.4632L17.7382%2020.4632C18.3417%2020.4632%2018.7246%2020.4453%2018.8868%2020.4095C19.1358%2020.3618%2019.3376%2020.2464%2019.4922%2020.0634C19.6507%2019.8763%2019.7299%2019.6276%2019.7299%2019.3173C19.7299%2019.0547%2019.6695%2018.8318%2019.5488%2018.6488C19.4281%2018.4658%2019.2527%2018.3325%2019.0226%2018.2489C18.7963%2018.1653%2018.3021%2018.1235%2017.5401%2018.1235L16.1878%2018.1235Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2010.6875L20.1781%2010.6875L19.4538%208.69995L16.1381%208.69995L15.4534%2010.6875L13.6768%2010.6875L16.9076%201.9375L18.6786%201.9375L22%2010.6875ZM18.9163%207.2257L17.7733%203.97877L16.653%207.2257L18.9163%207.2257Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-text-orientation-rotateup { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5.9142%202.48263L2%205.89535L3.1071%206.86061L5.68491%204.61307L5.68491%2022L7.25059%2022L7.25059%204.61307L9.82839%206.86061L10.9355%205.89535L7.0213%202.48263L6.46775%202L5.9142%202.48263Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M21.9277%2012.5942L21.8993%2014.2496L19.9679%2014.9391L19.9162%2017.9517L21.8256%2018.5424L21.7979%2020.1567L13.3952%2017.3594L13.4228%2015.7502L21.9277%2012.5942ZM18.5353%2015.4508L15.3807%2016.5406L18.5%2017.5072L18.5353%2015.4508Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M13.4994%2011.0787L13.5511%208.06604C13.5614%207.46968%2013.5978%207.02537%2013.6605%206.7331C13.7194%206.43747%2013.8392%206.1734%2014.0199%205.94087C14.2008%205.70492%2014.4405%205.50741%2014.7391%205.34834C15.0339%205.18933%2015.3639%205.10684%2015.7291%205.10087C16.1251%205.0944%2016.4867%205.18442%2016.814%205.37095C17.1413%205.55405%2017.3849%205.80704%2017.5446%206.12994C17.7024%205.66822%2017.9641%205.31103%2018.3296%205.05835C18.6952%204.80567%2019.1221%204.67534%2019.6103%204.66736C19.9947%204.66107%2020.3681%204.73549%2020.7306%204.8906C21.0892%205.04235%2021.3757%205.25524%2021.59%205.52927C21.8006%205.79994%2021.9274%206.13708%2021.9704%206.54069C21.9968%206.79381%2022.0056%207.40527%2021.9966%208.37509V11.0787H13.4994ZM14.9325%209.53393L16.8872%209.50197L16.9043%208.50461C16.9145%207.91168%2016.9112%207.5434%2016.8945%207.39976C16.8643%207.13985%2016.7679%206.93756%2016.6051%206.79289C16.4386%206.64485%2016.2188%206.57306%2015.9459%206.57752C15.6845%206.5818%2015.472%206.65037%2015.3083%206.78325C15.1408%206.91277%2015.0376%207.10462%2014.9986%207.35881C14.9768%207.50993%2014.9598%207.94364%2014.9475%208.65996L14.9325%209.53393ZM18.2941%209.47896L20.5545%209.442L20.5786%208.03336C20.588%207.48499%2020.5767%207.1374%2020.5446%206.99059C20.5024%206.76514%2020.3941%206.58359%2020.2196%206.44597C20.0414%206.30497%2019.8024%206.23693%2019.5026%206.24183C19.2489%206.24598%2019.0327%206.30434%2018.854%206.4169C18.6753%206.52947%2018.5437%206.69095%2018.4594%206.90133C18.3752%207.10829%2018.3271%207.55794%2018.3152%208.25026L18.2941%209.47896Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-text-orientation-rotatedown { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7.0213%2021.5174L10.9355%2018.1047L9.82839%2017.1394L7.25058%2019.3869L7.25059%202L5.68491%202L5.68491%2019.3869L3.1071%2017.1394L2%2018.1047L5.91419%2021.5174L6.46774%2022L7.0213%2021.5174Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M13.4675%2011.4058L13.4959%209.75035L15.4273%209.06091L15.479%206.04827L13.5695%205.45761L13.5972%203.84333L22%206.64062L21.9724%208.24976L13.4675%2011.4058ZM16.8599%208.54922L20.0145%207.45944L16.8952%206.49282L16.8599%208.54922Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M21.8957%2012.9213L21.844%2015.934C21.8338%2016.5303%2021.7974%2016.9746%2021.7347%2017.2669C21.6758%2017.5625%2021.556%2017.8266%2021.3752%2018.0591C21.1944%2018.2951%2020.9547%2018.4926%2020.656%2018.6517C20.3612%2018.8107%2020.0312%2018.8932%2019.6661%2018.8991C19.2701%2018.9056%2018.9085%2018.8156%2018.5812%2018.6291C18.2538%2018.446%2018.0103%2018.193%2017.8506%2017.8701C17.6928%2018.3318%2017.4311%2018.689%2017.0655%2018.9417C16.7%2019.1943%2016.2731%2019.3247%2015.7849%2019.3326C15.4005%2019.3389%2015.0271%2019.2645%2014.6646%2019.1094C14.306%2018.9577%2014.0195%2018.7448%2013.8051%2018.4707C13.5946%2018.2001%2013.4678%2017.8629%2013.4248%2017.4593C13.3984%2017.2062%2013.3896%2016.5947%2013.3986%2015.6249L13.3986%2012.9213L21.8957%2012.9213ZM20.4627%2014.4661L18.508%2014.498L18.4909%2015.4954C18.4807%2016.0883%2018.484%2016.4566%2018.5007%2016.6002C18.5309%2016.8601%2018.6273%2017.0624%2018.7901%2017.2071C18.9566%2017.3552%2019.1764%2017.4269%2019.4493%2017.4225C19.7107%2017.4182%2019.9232%2017.3496%2020.0869%2017.2167C20.2544%2017.0872%2020.3576%2016.8954%2020.3965%2016.6412C20.4184%2016.4901%2020.4354%2016.0564%2020.4477%2015.34L20.4627%2014.4661ZM17.101%2014.521L14.8407%2014.558L14.8166%2015.9666C14.8071%2016.515%2014.8185%2016.8626%2014.8505%2017.0094C14.8928%2017.2349%2015.0011%2017.4164%2015.1755%2017.554C15.3537%2017.695%2015.5928%2017.7631%2015.8926%2017.7582C16.1463%2017.754%2016.3625%2017.6957%2016.5412%2017.5831C16.7199%2017.4705%2016.8514%2017.3091%2016.9358%2017.0987C17.02%2016.8917%2017.0681%2016.4421%2017.08%2015.7497L17.101%2014.521Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} .navbar i.icon.icon-logo { width: 100px; height: 14px; @@ -8249,3 +8286,10 @@ html.pixel-ratio-3 .cell-styles.dataview .row li { .picker-modal.container-view-comment .pages { background-color: #FFFFFF; } +.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-title { + font-weight: normal; +} +.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-subtitle { + font-size: 14px; + color: #9e9e9e; +} diff --git a/apps/spreadsheeteditor/mobile/resources/less/app-ios.less b/apps/spreadsheeteditor/mobile/resources/less/app-ios.less index ea4955770..1fe2094fb 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/app-ios.less +++ b/apps/spreadsheeteditor/mobile/resources/less/app-ios.less @@ -354,4 +354,19 @@ input, textarea { .swipe-container, .toolbar, .pages { background-color: #FFFFFF; } +} + +// Macros settings +.page-macros-settings[data-page="settings-macros-view"] { + .list-block { + li.media-item { + .item-title { + font-weight: normal; + } + .item-subtitle { + font-size: 14px; + color: @gray; + } + } + } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/resources/less/app-material.less b/apps/spreadsheeteditor/mobile/resources/less/app-material.less index da83d5662..c4ca7fba0 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/app-material.less +++ b/apps/spreadsheeteditor/mobile/resources/less/app-material.less @@ -355,4 +355,19 @@ input, textarea { .swipe-container, .toolbar, .pages { background-color: #FFFFFF; } +} + +// Macros settings +.page-macros-settings[data-page="settings-macros-view"] { + .list-block { + li.media-item { + .item-title { + font-weight: normal; + } + .item-subtitle { + font-size: 14px; + color: @gray; + } + } + } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less index 4db7458e3..7d65fe9a0 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less @@ -440,6 +440,37 @@ i.icon { height: 24px; .encoded-svg-background(''); } + // Text orientation + &.icon-text-orientation-horizontal { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-text-orientation-anglecount { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-text-orientation-angleclock { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-text-orientation-vertical { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-text-orientation-rotateup { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-text-orientation-rotatedown { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } } .active { diff --git a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less index cd0e20035..a81b86ed4 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less @@ -388,6 +388,37 @@ i.icon { height: 24px; .encoded-svg-background(''); } + // Text orientation + &.icon-text-orientation-horizontal { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-text-orientation-anglecount { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-text-orientation-angleclock { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-text-orientation-vertical { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-text-orientation-rotateup { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-text-orientation-rotatedown { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } } // Overwrite color for toolbar