From 6c7ebc300a85c933f80e648866cb37097052843b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 26 Feb 2021 16:36:24 +0300 Subject: [PATCH] Update icons --- apps/common/main/resources/less/toolbar.less | 16 +- .../main/app/controller/Toolbar.js | 8 +- .../main/resources/img/cf-icons.svg | 655 ++++++++++-------- 3 files changed, 361 insertions(+), 318 deletions(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 7fb35ebc9..4a969b7a5 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -637,8 +637,8 @@ .item-databar { .icon { - width: 20px; - height: 22px; + width: 25px; + height: 25px; } svg.icon { @@ -648,14 +648,14 @@ fill: @icon-normal; } - width: 20px; - height: 22px; + width: 25px; + height: 25px; } .item-colorscale { .icon { - width: 20px; - height: 21px; + width: 25px; + height: 25px; } svg.icon { @@ -665,8 +665,8 @@ fill: @icon-normal; } - width: 20px; - height: 21px; + width: 25px; + height: 25px; } .menu-iconsets { diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 610701660..127741f1e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1597,12 +1597,12 @@ define([ var me = this; var menuItem = this.toolbar.mnuDataBars; menuItem.menu.addItem(new Common.UI.MenuItem({ - template: _.template('') + template: _.template('') })); var picker = new Common.UI.DataViewSimple({ el: $('#id-toolbar-menu-databar', menuItem.$el), parentMenu: menuItem.menu, - itemTemplate: _.template('
\">
') + itemTemplate: _.template('
\">
') }); picker.on('item:click', function(picker, item, record, e) { if (me.api) { @@ -1632,12 +1632,12 @@ define([ menuItem = this.toolbar.mnuColorScales; menuItem.menu.addItem(new Common.UI.MenuItem({ - template: _.template('') + template: _.template('') })); picker = new Common.UI.DataViewSimple({ el: $('#id-toolbar-menu-colorscales', menuItem.$el), parentMenu: menuItem.menu, - itemTemplate: _.template('
\">
') + itemTemplate: _.template('
\">
') }); picker.on('item:click', function(picker, item, record, e) { if (me.api) { diff --git a/apps/spreadsheeteditor/main/resources/img/cf-icons.svg b/apps/spreadsheeteditor/main/resources/img/cf-icons.svg index 9952806d9..44cd0d1c8 100644 --- a/apps/spreadsheeteditor/main/resources/img/cf-icons.svg +++ b/apps/spreadsheeteditor/main/resources/img/cf-icons.svg @@ -1,330 +1,373 @@ \ No newline at end of file