Added groups for cell styles in the table

apps/common/main/lib/util/define.js

@@ -598,6 +598,84 @@ define(function(){ 'use strict';
         }
     })(), Common.define.conditionalData || {});
 
+
+    Common.define.styleData = _.extend( new(function() {
+        return {
+            textGoodBadAndNeutral: 'Good, Bad and Neutral',
+            textDataAndModel: 'Data and Model',
+            textTitlesAndHeadings: 'Titles and Headings',
+            textThemedCallStyles: 'Themed Call Styles',
+            textNumberFormat: 'Number Format',
+        
+            getStyleGroupData: function () {
+                return [
+                    {id: 'menu-style-group-color',  caption: this.textGoodBadAndNeutral },
+                    {id: 'menu-style-group-model',  caption: this.textDataAndModel },
+                    {id: 'menu-style-group-title',  caption: this.textTitlesAndHeadings },
+                    {id: 'menu-style-group-themed', caption: this.textThemedCallStyles }, 
+                    {id: 'menu-style-group-number', caption: this.textNumberFormat } 
+                ];
+            },
+
+            getStyleData: function () {
+                return [
+                    {group: 'menu-style-group-color',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-color',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-color',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-color',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    
+                    {group: 'menu-style-group-model',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-model',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-model',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-model',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-model',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-model',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-model',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-model',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    
+                    {group: 'menu-style-group-title',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-title',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-title',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-title',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-title',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-title',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-themed',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    
+                    {group: 'menu-style-group-number',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-number',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-number',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-number',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-style-group-number',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear}
+                ];
+            },
+        }
+    })(), Common.define.styleData || {});
+
+
     Common.define.effectData = _.extend(new (function () {
         return {
             textEntrance: 'Entrance Effect',

apps/documenteditor/mobile/dist/js/202.js

@@ -0,0 +1,2 @@
+/*! For license information please see 202.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[202],{"./node_modules/framework7/framework7-bundle.min.css":function(e,n,o){o.r(n)}}]);

apps/documenteditor/mobile/dist/js/202.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/documenteditor/mobile/dist/js/592.js

@@ -0,0 +1,2 @@
+/*! For license information please see 592.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[592],{"./node_modules/framework7/framework7-bundle-rtl.css":function(e,o,r){r.r(o)}}]);

apps/documenteditor/mobile/dist/js/592.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/documenteditor/mobile/dist/js/855.js

@@ -0,0 +1,2 @@
+/*! For license information please see 855.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[855],{"./node_modules/framework7/framework7-bundle.css":function(e,o,u){u.r(o)}}]);

apps/documenteditor/mobile/dist/js/855.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/documenteditor/mobile/dist/js/953.js

@@ -0,0 +1,2 @@
+/*! For license information please see 953.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[953],{"./node_modules/framework7/framework7-bundle-rtl.min.css":function(e,n,o){o.r(n)}}]);

apps/documenteditor/mobile/dist/js/953.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/documenteditor/mobile/dist/js/964.js

@@ -0,0 +1,2 @@
+/*! For license information please see 964.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[964],{"../../apps/documenteditor/mobile/src/less/app.less":function(e,s,t){t.r(s)}}]);

apps/documenteditor/mobile/dist/js/964.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/documenteditor/mobile/dist/js/app.js.LICENSE.txt

@@ -0,0 +1,37 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */
+
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */

apps/documenteditor/mobile/index.html

@@ -0,0 +1,169 @@
+<!doctype html><html><head><meta charset="utf-8"><meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: blob:"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui,viewport-fit=cover"><meta name="theme-color" content="#007aff"><meta name="format-detection" content="telephone=no"><meta name="msapplication-tap-highlight" content="no"><title>Desktop Editor</title><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"><link rel="apple-touch-icon" href="static/icons/apple-touch-icon.png"><link rel="icon" href="static/icons/favicon.png"><style>body {
+    margin: 0;
+}
+
+body.theme-type-dark {
+    --background-navbar-ios: #232323;
+    --background-navbar-word: #232323;
+    --background-navbar-cell: #232323;
+    --background-navbar-slide: #232323;
+}
+
+.skl-navbar {
+    --box-logo-height: 26px;
+    --skl-navbar-height: 44px;
+    --skl-pixel-ratio: 1;
+}
+
+.skl-navbar--md {
+    --skl-navbar-height: 56px;
+}
+
+.skl-pixel-ratio--2 {
+    --skl-pixel-ratio: 2;
+}
+
+.skl-navbar {
+    height: calc(var(--skl-navbar-height) + var(--box-logo-height));
+    width: 100%;
+    position: relative;
+}
+
+.skl-navbar.skl-navbar--md {
+    /*height: calc(56px + 26px);*/
+}
+
+.skl-navbar.skl-navbar--ios {
+    background-color: var(--background-navbar-ios, #f7f7f8);
+}
+
+.skl-navbar.skl-navbar--word.skl-navbar--md {
+    background-color: var(--background-navbar-word, #446995);
+}
+
+.skl-navbar.skl-navbar--cell.skl-navbar--md {
+    background-color: var(--background-navbar-cell, #40865c);
+}
+
+.skl-navbar.skl-navbar--slide.skl-navbar--md {
+    background-color: var(--background-navbar-slide, #aa5252);
+}
+
+.skl-navbar::before {
+    content: '';
+    position: absolute;
+    width: 100%;
+}
+
+.skl-navbar:not(.skl-navbar--md)::before {
+    background-color: rgba(0,0,0,0.25);
+    display: block;
+    z-index: 15;
+    top: auto;
+    right: auto;
+    bottom: 0;
+    left: 0;
+    height: 1px;
+    transform-origin: 50% 100%;
+    transform: scaleY(calc(1 / var(--skl-pixel-ratio)));
+}
+
+.skl-navbar.skl-navbar--md::before {
+    right: 0;
+    width: 100%;
+    top: 100%;
+    bottom: auto;
+    height: 8px;
+    pointer-events: none;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.25) 0%, rgba(0, 0, 0, 0.08) 40%, rgba(0, 0, 0, 0.04) 50%, rgba(0, 0, 0, 0) 90%, rgba(0, 0, 0, 0) 100%)
+}
+
+.skl-lines {
+    display: none;
+}
+
+.skl-line {
+    height: 15px;
+    margin: 30px;
+    background: #e2e2e2;
+    overflow: hidden;
+    position: relative;
+    -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+    animation: flickerAnimation 2s infinite ease-in-out;
+}
+
+@keyframes flickerAnimation {
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}
+@-o-keyframes flickerAnimation{
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}
+@-moz-keyframes flickerAnimation{
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}
+@-webkit-keyframes flickerAnimation{
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}</style><script defer="defer" src="dist/js/app.js"></script></head><body><script>let obj = !localStorage ? {id: 'theme-light', type: 'light'} : JSON.parse(localStorage.getItem("ui-theme"));
+if ( !obj ) {
+    obj = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ?
+                {id: 'theme-dark', type: 'dark'} : {id: 'theme-light', type: 'light'};
+    localStorage && localStorage.setItem("ui-theme", JSON.stringify(obj));
+}
+
+document.body.classList.add(`theme-type-${obj.type}`);</script><section class="skl-container"><div class="skl-navbar skl-navbar--word"></div><div class="skl-lines"><div class="skl-line"></div><div class="skl-line"></div><div class="skl-line"></div></div></section><script>const isAndroid = /Android/.test(navigator.userAgent);
+        if ( isAndroid && navigator.platform == 'Win32' )
+            // Framework7 doesn't set Device.android flag when navigator.platform == 'Win32', change it for debug
+            navigator.__defineGetter__('platform', () => 'Win32Debug');
+
+        const element_add_class = (el, cls) => (el && el.classList.add(cls));
+
+        let navbar = document.querySelector('.skl-navbar');
+        if ( window.devicePixelRatio ) {
+            element_add_class(navbar, `skl-pixel-ratio--${Math.floor(window.devicePixelRatio)}`);
+        }
+
+        if ( !isAndroid ) {
+            const ua = navigator.userAgent;
+            const iPad = ua.match(/(iPad).*OS\s([\d_]+)/);
+            const iPhone = !iPad && ua.match(/(iPhone\sOS|iOS)\s([\d_]+)/);
+
+            if ( !iPad && !iPhone ) {
+                Object.defineProperty(navigator, 'userAgent', {
+                    get: function () { return `iPad; CPU OS 11_0 ${ua}`; }
+                });
+            } else {
+                element_add_class(navbar, `skl-navbar--ios`);
+            }
+        } else {
+            element_add_class(navbar, `skl-navbar--md`);
+        }
+
+        const getUrlParams = () => {
+            let e,
+                a = /\+/g,  // Regex for replacing addition symbol with a space
+                r = /([^&=]+)=?([^&]*)/g,
+                d = s => decodeURIComponent(s.replace(a, " ")),
+                q = window.location.search.substring(1),
+                urlParams = {};
+
+            while (e = r.exec(q))
+                urlParams[d(e[1])] = d(e[2]);
+
+            return urlParams;
+        };
+
+        window.Common = {Locale: {defaultLang: "en"}};
+        let params = getUrlParams(),
+            lang = (params["lang"] || window.Common.Locale.defaultLang).split(/[\-\_]/)[0];
+
+        window.Common.Locale.currentLang = lang;
+        window.frameEditorId = params["frameEditorId"];
+        window.parentOrigin = params["parentOrigin"];</script><script src="../../../vendor/jquery/jquery.min.js"></script><div id="app"></div></body></html>

apps/presentationeditor/mobile/dist/js/202.js

@@ -0,0 +1,2 @@
+/*! For license information please see 202.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[202],{"./node_modules/framework7/framework7-bundle.min.css":function(e,n,o){o.r(n)}}]);

apps/presentationeditor/mobile/dist/js/202.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/presentationeditor/mobile/dist/js/592.js

@@ -0,0 +1,2 @@
+/*! For license information please see 592.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[592],{"./node_modules/framework7/framework7-bundle-rtl.css":function(e,o,r){r.r(o)}}]);

apps/presentationeditor/mobile/dist/js/592.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/presentationeditor/mobile/dist/js/612.js

@@ -0,0 +1,2 @@
+/*! For license information please see 612.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[612],{"../../apps/presentationeditor/mobile/src/less/app.less":function(e,s,t){t.r(s)}}]);

apps/presentationeditor/mobile/dist/js/612.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/presentationeditor/mobile/dist/js/855.js

@@ -0,0 +1,2 @@
+/*! For license information please see 855.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[855],{"./node_modules/framework7/framework7-bundle.css":function(e,o,u){u.r(o)}}]);

apps/presentationeditor/mobile/dist/js/855.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/presentationeditor/mobile/dist/js/953.js

@@ -0,0 +1,2 @@
+/*! For license information please see 953.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[953],{"./node_modules/framework7/framework7-bundle-rtl.min.css":function(e,n,o){o.r(n)}}]);

apps/presentationeditor/mobile/dist/js/953.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/presentationeditor/mobile/dist/js/app.js.LICENSE.txt

@@ -0,0 +1,37 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */
+
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */

apps/presentationeditor/mobile/index.html

@@ -0,0 +1,169 @@
+<!doctype html><html><head><meta charset="utf-8"><meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: blob:"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui,viewport-fit=cover"><meta name="theme-color" content="#007aff"><meta name="format-detection" content="telephone=no"><meta name="msapplication-tap-highlight" content="no"><title>Presentation Editor</title><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"><link rel="apple-touch-icon" href="static/icons/apple-touch-icon.png"><link rel="icon" href="static/icons/favicon.png"><style>body {
+    margin: 0;
+}
+
+body.theme-type-dark {
+    --background-navbar-ios: #232323;
+    --background-navbar-word: #232323;
+    --background-navbar-cell: #232323;
+    --background-navbar-slide: #232323;
+}
+
+.skl-navbar {
+    --box-logo-height: 26px;
+    --skl-navbar-height: 44px;
+    --skl-pixel-ratio: 1;
+}
+
+.skl-navbar--md {
+    --skl-navbar-height: 56px;
+}
+
+.skl-pixel-ratio--2 {
+    --skl-pixel-ratio: 2;
+}
+
+.skl-navbar {
+    height: calc(var(--skl-navbar-height) + var(--box-logo-height));
+    width: 100%;
+    position: relative;
+}
+
+.skl-navbar.skl-navbar--md {
+    /*height: calc(56px + 26px);*/
+}
+
+.skl-navbar.skl-navbar--ios {
+    background-color: var(--background-navbar-ios, #f7f7f8);
+}
+
+.skl-navbar.skl-navbar--word.skl-navbar--md {
+    background-color: var(--background-navbar-word, #446995);
+}
+
+.skl-navbar.skl-navbar--cell.skl-navbar--md {
+    background-color: var(--background-navbar-cell, #40865c);
+}
+
+.skl-navbar.skl-navbar--slide.skl-navbar--md {
+    background-color: var(--background-navbar-slide, #aa5252);
+}
+
+.skl-navbar::before {
+    content: '';
+    position: absolute;
+    width: 100%;
+}
+
+.skl-navbar:not(.skl-navbar--md)::before {
+    background-color: rgba(0,0,0,0.25);
+    display: block;
+    z-index: 15;
+    top: auto;
+    right: auto;
+    bottom: 0;
+    left: 0;
+    height: 1px;
+    transform-origin: 50% 100%;
+    transform: scaleY(calc(1 / var(--skl-pixel-ratio)));
+}
+
+.skl-navbar.skl-navbar--md::before {
+    right: 0;
+    width: 100%;
+    top: 100%;
+    bottom: auto;
+    height: 8px;
+    pointer-events: none;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.25) 0%, rgba(0, 0, 0, 0.08) 40%, rgba(0, 0, 0, 0.04) 50%, rgba(0, 0, 0, 0) 90%, rgba(0, 0, 0, 0) 100%)
+}
+
+.skl-lines {
+    display: none;
+}
+
+.skl-line {
+    height: 15px;
+    margin: 30px;
+    background: #e2e2e2;
+    overflow: hidden;
+    position: relative;
+    -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+    animation: flickerAnimation 2s infinite ease-in-out;
+}
+
+@keyframes flickerAnimation {
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}
+@-o-keyframes flickerAnimation{
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}
+@-moz-keyframes flickerAnimation{
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}
+@-webkit-keyframes flickerAnimation{
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}</style><script defer="defer" src="dist/js/app.js"></script></head><body><script>let obj = !localStorage ? {id: 'theme-light', type: 'light'} : JSON.parse(localStorage.getItem("ui-theme"));
+if ( !obj ) {
+    obj = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ?
+                {id: 'theme-dark', type: 'dark'} : {id: 'theme-light', type: 'light'};
+    localStorage && localStorage.setItem("ui-theme", JSON.stringify(obj));
+}
+
+document.body.classList.add(`theme-type-${obj.type}`);</script><section class="skl-container"><div class="skl-navbar skl-navbar--slide"></div></section><script>const isAndroid = /Android/.test(navigator.userAgent);
+        if ( isAndroid && navigator.platform == 'Win32' )
+            // Framework7 doesn't set Device.android flag when navigator.platform == 'Win32', change it for debug
+            navigator.__defineGetter__('platform', () => 'Win32Debug');
+
+        const element_add_class = (el, cls) => (el && el.classList.add(cls));
+
+        let navbar = document.querySelector('.skl-navbar');
+        if ( window.devicePixelRatio ) {
+            element_add_class(navbar, `skl-pixel-ratio--${Math.floor(window.devicePixelRatio)}`);
+        }
+
+        if ( !isAndroid ) {
+            const ua = navigator.userAgent;
+            const iPad = ua.match(/(iPad).*OS\s([\d_]+)/);
+            const iPhone = !iPad && ua.match(/(iPhone\sOS|iOS)\s([\d_]+)/);
+
+            if ( !iPad && !iPhone ) {
+                Object.defineProperty(navigator, 'userAgent', {
+                    get: function () { return `iPad; CPU OS 11_0 ${ua}`; }
+                });
+            } else {
+                element_add_class(navbar, `skl-navbar--ios`);
+            }
+        } else {
+            element_add_class(navbar, `skl-navbar--md`);
+        }
+
+        const getUrlParams = () => {
+            let e,
+                a = /\+/g,  // Regex for replacing addition symbol with a space
+                r = /([^&=]+)=?([^&]*)/g,
+                d = s => decodeURIComponent(s.replace(a, " ")),
+                q = window.location.search.substring(1),
+                urlParams = {};
+
+            while (e = r.exec(q))
+                urlParams[d(e[1])] = d(e[2]);
+
+            return urlParams;
+        }
+
+        window.Common = {Locale: {defaultLang: "en"}};
+        let params = getUrlParams(),
+            lang = (params["lang"] || window.Common.Locale.defaultLang).split(/[\-\_]/)[0];
+
+        window.frameEditorId = params["frameEditorId"];
+        window.parentOrigin = params["parentOrigin"];
+        window.Common.Locale.currentLang = lang;</script><script src="../../../vendor/jquery/jquery.min.js"></script><div id="app"></div></body></html>

apps/spreadsheeteditor/main/app/controller/Toolbar.js

@@ -2211,8 +2211,9 @@ define([
                 });
             } else {
                 var arr = [];
-                _.each(styles, function(style){
+                _.each(styles, function(style, index){
                     arr.push({
+                        group: Common.define.styleData.getStyleData()[index].group,
                         imageUrl: style.asc_getImage(),
                         name    : style.asc_getName(),
                         tip     : mainController.translationTable[style.get_Name()] || style.get_Name(),

apps/spreadsheeteditor/main/app/view/Toolbar.js

@@ -1285,7 +1285,8 @@ define([
                     itemWidth       : 112,
                     itemHeight      : 40,
                     style: 'min-width:158px;',
-                    menuMaxHeight   : 226,
+                    groups: new Common.UI.DataViewGroupStore(Common.define.styleData.getStyleGroupData()),
+                    menuMaxHeight   : 350,
                     lock            : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set['FormatCells']],
                     dataHint        : '1',
                     dataHintDirection: 'bottom',
@@ -3080,6 +3081,7 @@ define([
         textCenterBorders:  'Inside Vertical Borders',
         textDiagDownBorder: 'Diagonal Down Border',
         textDiagUpBorder:   'Diagonal Up Border',
+        textNone:           'None',
         tipWrap:            'Wrap Text',
         txtClearAll:        'All',
         txtClearText:       'Text',

apps/spreadsheeteditor/main/locale/ru.json

@@ -100,6 +100,11 @@
   "Common.define.conditionalData.textUnique": "Уникальное",
   "Common.define.conditionalData.textValue": "Значение равно",
   "Common.define.conditionalData.textYesterday": "Вчера",
+  "Common.define.styleData.textGoodBadAndNeutral": "Хороший, плохой и нейтральный",
+  "Common.define.styleData.textDataAndModel": "Данные и модель",
+  "Common.define.styleData.textTitlesAndHeadings": "Названия и заголовки",
+  "Common.define.styleData.textThemedCallStyles": "Стили ячеек с темой",
+  "Common.define.styleData.textNumberFormat": "Числовой формат",
   "Common.Translation.warnFileLocked": "Файл редактируется в другом приложении. Вы можете продолжить редактирование и сохранить его как копию.",
   "Common.Translation.warnFileLockedBtnEdit": "Создать копию",
   "Common.Translation.warnFileLockedBtnView": "Открыть на просмотр",

apps/spreadsheeteditor/main/resources/less/toolbar.less

@@ -146,3 +146,21 @@
         margin-right: 2px;
     }
 }
+
+.combo-styles {
+    .menu-picker-container .dataview {
+      padding: 10px 0 0 2px;
+    }
+    .dropdown-menu {
+      padding-bottom: 5px;
+    }
+}
+
+.dataview {
+    padding: 0 0 0 2px;
+  
+    .group-description {
+      padding: 3px 0 3px 10px;
+      .font-weight-bold();
+    }
+}

apps/spreadsheeteditor/mobile/css/app.css

@@ -0,0 +1,6 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */#ws-canvas-outer{bottom:0;left:0;position:absolute;right:0;top:0}#ws-canvas{border:0}#ws-canvas-graphic,#ws-canvas-graphic-overlay,#ws-canvas-overlay{border:0;left:0;position:absolute;top:0;z-index:1}#ws-v-scrollbar{bottom:18px;overflow:hidden;position:absolute;right:0;top:-1px;width:19px;z-index:10}#ws-v-scroll-helper{width:1px}#ws-h-scrollbar{bottom:0;height:19px;left:0;overflow:hidden;position:absolute;right:18px;z-index:10}#ws-h-scroll-helper{height:1px}#ws-scrollbar-corner{border:0;bottom:0;height:18px;position:absolute;right:0;width:18px;z-index:10}#ws-h-scrollbar .jspHorizontalBar,#ws-h-scrollbar .jspTrack,#ws-scrollbar-corner,#ws-v-scrollbar .jspTrack,#ws-v-scrollbar .jspVerticalBar{background-color:#dce2e8}#ws-h-scrollbar .jspDrag,#ws-v-scrollbar .jspDrag{background-color:silver}#ws-h-scrollbar .jspDrag.jspActive,#ws-h-scrollbar .jspDrag.jspHover,#ws-v-scrollbar .jspDrag.jspActive,#ws-v-scrollbar .jspDrag.jspHover{background-color:grey}#ws-v-scrollbar .jspVerticalBar{border-left:1px solid #c1c6cc;width:7px}#ws-v-scrollbar .jspTrack{width:8px}#ws-h-scrollbar .jspHorizontalBar{border-top:1px solid #c1c6cc;height:7px}#ws-h-scrollbar .jspTrack{height:8px}
+/*# sourceMappingURL=css/app.css.map */

apps/spreadsheeteditor/mobile/dist/js/202.js

@@ -0,0 +1,2 @@
+/*! For license information please see 202.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[202],{"./node_modules/framework7/framework7-bundle.min.css":function(e,n,o){o.r(n)}}]);

apps/spreadsheeteditor/mobile/dist/js/202.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/spreadsheeteditor/mobile/dist/js/592.js

@@ -0,0 +1,2 @@
+/*! For license information please see 592.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[592],{"./node_modules/framework7/framework7-bundle-rtl.css":function(e,o,r){r.r(o)}}]);

apps/spreadsheeteditor/mobile/dist/js/592.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/spreadsheeteditor/mobile/dist/js/855.js

@@ -0,0 +1,2 @@
+/*! For license information please see 855.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[855],{"./node_modules/framework7/framework7-bundle.css":function(e,o,u){u.r(o)}}]);

apps/spreadsheeteditor/mobile/dist/js/855.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/spreadsheeteditor/mobile/dist/js/887.js

@@ -0,0 +1,2 @@
+/*! For license information please see 887.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[887],{"../../apps/spreadsheeteditor/mobile/src/less/app.less":function(e,s,t){t.r(s)}}]);

apps/spreadsheeteditor/mobile/dist/js/887.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/spreadsheeteditor/mobile/dist/js/953.js

@@ -0,0 +1,2 @@
+/*! For license information please see 953.js.LICENSE.txt */
+"use strict";(self.webpackChunkdocumenteditor=self.webpackChunkdocumenteditor||[]).push([[953],{"./node_modules/framework7/framework7-bundle-rtl.min.css":function(e,n,o){o.r(n)}}]);

apps/spreadsheeteditor/mobile/dist/js/953.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */

apps/spreadsheeteditor/mobile/dist/js/app.js.LICENSE.txt

@@ -0,0 +1,37 @@
+/*!
+ * 
+ * * Version: 7.1.0d (build: 0)
+ *
+ */
+
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */

apps/spreadsheeteditor/mobile/index.html

@@ -0,0 +1,169 @@
+<!doctype html><html><head><meta charset="utf-8"><meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: blob:"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui,viewport-fit=cover"><meta name="theme-color" content="#007aff"><meta name="format-detection" content="telephone=no"><meta name="msapplication-tap-highlight" content="no"><title>Spreadsheet Editor</title><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"><link rel="apple-touch-icon" href="static/icons/apple-touch-icon.png"><link rel="icon" href="static/icons/favicon.png"><style>body {
+    margin: 0;
+}
+
+body.theme-type-dark {
+    --background-navbar-ios: #232323;
+    --background-navbar-word: #232323;
+    --background-navbar-cell: #232323;
+    --background-navbar-slide: #232323;
+}
+
+.skl-navbar {
+    --box-logo-height: 26px;
+    --skl-navbar-height: 44px;
+    --skl-pixel-ratio: 1;
+}
+
+.skl-navbar--md {
+    --skl-navbar-height: 56px;
+}
+
+.skl-pixel-ratio--2 {
+    --skl-pixel-ratio: 2;
+}
+
+.skl-navbar {
+    height: calc(var(--skl-navbar-height) + var(--box-logo-height));
+    width: 100%;
+    position: relative;
+}
+
+.skl-navbar.skl-navbar--md {
+    /*height: calc(56px + 26px);*/
+}
+
+.skl-navbar.skl-navbar--ios {
+    background-color: var(--background-navbar-ios, #f7f7f8);
+}
+
+.skl-navbar.skl-navbar--word.skl-navbar--md {
+    background-color: var(--background-navbar-word, #446995);
+}
+
+.skl-navbar.skl-navbar--cell.skl-navbar--md {
+    background-color: var(--background-navbar-cell, #40865c);
+}
+
+.skl-navbar.skl-navbar--slide.skl-navbar--md {
+    background-color: var(--background-navbar-slide, #aa5252);
+}
+
+.skl-navbar::before {
+    content: '';
+    position: absolute;
+    width: 100%;
+}
+
+.skl-navbar:not(.skl-navbar--md)::before {
+    background-color: rgba(0,0,0,0.25);
+    display: block;
+    z-index: 15;
+    top: auto;
+    right: auto;
+    bottom: 0;
+    left: 0;
+    height: 1px;
+    transform-origin: 50% 100%;
+    transform: scaleY(calc(1 / var(--skl-pixel-ratio)));
+}
+
+.skl-navbar.skl-navbar--md::before {
+    right: 0;
+    width: 100%;
+    top: 100%;
+    bottom: auto;
+    height: 8px;
+    pointer-events: none;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.25) 0%, rgba(0, 0, 0, 0.08) 40%, rgba(0, 0, 0, 0.04) 50%, rgba(0, 0, 0, 0) 90%, rgba(0, 0, 0, 0) 100%)
+}
+
+.skl-lines {
+    display: none;
+}
+
+.skl-line {
+    height: 15px;
+    margin: 30px;
+    background: #e2e2e2;
+    overflow: hidden;
+    position: relative;
+    -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+    animation: flickerAnimation 2s infinite ease-in-out;
+}
+
+@keyframes flickerAnimation {
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}
+@-o-keyframes flickerAnimation{
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}
+@-moz-keyframes flickerAnimation{
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}
+@-webkit-keyframes flickerAnimation{
+    0%   { opacity:0.1; }
+    50%  { opacity:1; }
+    100% { opacity:0.1; }
+}</style><script defer="defer" src="dist/js/app.js"></script><link href="css/app.css" rel="stylesheet"></head><body><script>let obj = !localStorage ? {id: 'theme-light', type: 'light'} : JSON.parse(localStorage.getItem("ui-theme"));
+if ( !obj ) {
+    obj = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ?
+                {id: 'theme-dark', type: 'dark'} : {id: 'theme-light', type: 'light'};
+    localStorage && localStorage.setItem("ui-theme", JSON.stringify(obj));
+}
+
+document.body.classList.add(`theme-type-${obj.type}`);</script><section class="skl-container"><div class="skl-navbar skl-navbar--cell"></div></section><script>const isAndroid = /Android/.test(navigator.userAgent);
+        if ( isAndroid && navigator.platform == 'Win32' )
+            // Framework7 doesn't set Device.android flag when navigator.platform == 'Win32', change it for debug
+            navigator.__defineGetter__('platform', () => 'Win32Debug');
+
+        const element_add_class = (el, cls) => (el && el.classList.add(cls));
+
+        let navbar = document.querySelector('.skl-navbar');
+        if ( window.devicePixelRatio ) {
+            element_add_class(navbar, `skl-pixel-ratio--${Math.floor(window.devicePixelRatio)}`);
+        }
+
+        if ( !isAndroid ) {
+            const ua = navigator.userAgent;
+            const iPad = ua.match(/(iPad).*OS\s([\d_]+)/);
+            const iPhone = !iPad && ua.match(/(iPhone\sOS|iOS)\s([\d_]+)/);
+
+            if ( !iPad && !iPhone ) {
+                Object.defineProperty(navigator, 'userAgent', {
+                    get: function () { return `iPad; CPU OS 11_0 ${ua}`; }
+                });
+            } else {
+                element_add_class(navbar, `skl-navbar--ios`);
+            }
+        } else {
+            element_add_class(navbar, `skl-navbar--md`);
+        }
+
+        const getUrlParams = () => {
+            let e,
+                a = /\+/g,  // Regex for replacing addition symbol with a space
+                r = /([^&=]+)=?([^&]*)/g,
+                d = s => decodeURIComponent(s.replace(a, " ")),
+                q = window.location.search.substring(1),
+                urlParams = {};
+
+            while (e = r.exec(q))
+                urlParams[d(e[1])] = d(e[2]);
+
+            return urlParams;
+        }
+
+        window.Common = {Locale: {defaultLang: "en"}};
+        let params = getUrlParams(),
+            lang = (params["lang"] || window.Common.Locale.defaultLang).split(/[\-\_]/)[0];
+
+        window.frameEditorId = params["frameEditorId"];
+        window.parentOrigin = params["parentOrigin"];
+        window.Common.Locale.currentLang = lang;</script><script src="../../../vendor/jquery/jquery.min.js"></script><div id="app"></div></body></html>

build/package-lock.json

@@ -900,9 +900,9 @@
       }
     },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dependencies": {
         "lodash": "^4.17.14"
       }
@@ -4851,25 +4851,20 @@
       }
     },
     "node_modules/grunt-spritesmith": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/grunt-spritesmith/-/grunt-spritesmith-6.9.0.tgz",
-      "integrity": "sha512-u6ZQwiivimm/sz9HalrFiniAZcesIq8eTdqqv2UinZ+eng0Ah3swFK6BvWFFeapzUXYCMHUKBc7a8liGQtn4wg==",
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/grunt-spritesmith/-/grunt-spritesmith-6.10.0.tgz",
+      "integrity": "sha512-vEmw9hH1W4pT860OKYF/uWqAbmEHbvEALChr9iXe2rTn1k1DgN2Dg2SjQukXB8/R9B0rAoacZQ97FtysUGG0cg==",
       "dependencies": {
-        "async": "~1.5.0",
+        "async": "~2.6.4",
         "spritesheet-templates": "^10.3.0",
         "spritesmith": "^3.4.0",
-        "underscore": "~1.13.1",
+        "underscore": "~1.13.3",
         "url2": "1.0.0"
       },
       "engines": {
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/grunt-spritesmith/node_modules/async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-    },
     "node_modules/grunt-svgmin": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/grunt-svgmin/-/grunt-svgmin-6.0.1.tgz",
@@ -12702,9 +12697,9 @@
       }
     },
     "node_modules/underscore": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz",
-      "integrity": "sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.4.tgz",
+      "integrity": "sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ=="
     },
     "node_modules/underscore.string": {
       "version": "3.3.6",
@@ -13342,7 +13337,7 @@
       "version": "0.0.1",
       "integrity": "sha1-JN2XDWx749RJy7SeBD2tLML6nOc=",
       "dependencies": {
-        "grunt-spritesmith": "^6.8.0"
+        "grunt-spritesmith": "^6.10.0"
       }
     }
   },
@@ -13988,9 +13983,9 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "requires": {
         "lodash": "^4.17.14"
       }
@@ -17113,22 +17108,15 @@
       }
     },
     "grunt-spritesmith": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/grunt-spritesmith/-/grunt-spritesmith-6.9.0.tgz",
-      "integrity": "sha512-u6ZQwiivimm/sz9HalrFiniAZcesIq8eTdqqv2UinZ+eng0Ah3swFK6BvWFFeapzUXYCMHUKBc7a8liGQtn4wg==",
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/grunt-spritesmith/-/grunt-spritesmith-6.10.0.tgz",
+      "integrity": "sha512-vEmw9hH1W4pT860OKYF/uWqAbmEHbvEALChr9iXe2rTn1k1DgN2Dg2SjQukXB8/R9B0rAoacZQ97FtysUGG0cg==",
       "requires": {
-        "async": "~1.5.0",
+        "async": "~2.6.4",
         "spritesheet-templates": "^10.3.0",
         "spritesmith": "^3.4.0",
-        "underscore": "~1.13.1",
+        "underscore": "~1.13.3",
         "url2": "1.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-        }
       }
     },
     "grunt-svgmin": {
@@ -17392,7 +17380,7 @@
     "iconsprite": {
       "version": "file:sprites",
       "requires": {
-        "grunt-spritesmith": "^6.8.0"
+        "grunt-spritesmith": "^6.10.0"
       }
     },
     "iconv-lite": {
@@ -22874,9 +22862,9 @@
       "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo="
     },
     "underscore": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz",
-      "integrity": "sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.4.tgz",
+      "integrity": "sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ=="
     },
     "underscore.string": {
       "version": "3.3.6",