diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png index 27c5fc2a2..b9f731ba9 100644 Binary files a/apps/common/main/resources/img/controls/toolbarbig.png and b/apps/common/main/resources/img/controls/toolbarbig.png differ diff --git a/apps/common/main/resources/img/controls/toolbarbig@2x.png b/apps/common/main/resources/img/controls/toolbarbig@2x.png index 98a5c5cbd..a5cc606ce 100644 Binary files a/apps/common/main/resources/img/controls/toolbarbig@2x.png and b/apps/common/main/resources/img/controls/toolbarbig@2x.png differ diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 8e508671b..ae8fb66fa 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -285,6 +285,12 @@ .button-normal-icon(~'x-huge .btn-ic-history', 34, @toolbar-big-icon-size); .button-normal-icon(~'x-huge .btn-ic-protect', 35, @toolbar-big-icon-size); .button-normal-icon(~'x-huge .btn-ic-signature', 36, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-add-pivot', 37, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-update-pivot', 38, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-pivot-layout', 39, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-blank-rows', 43, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-subtotals', 46, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-grand-totals', 52, @toolbar-big-icon-size); .button-normal-icon(review-save, 14, @toolbar-big-icon-size); .button-normal-icon(review-deny, 15, @toolbar-big-icon-size); .button-normal-icon(review-next, 16, @toolbar-big-icon-size); diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index 62459e5e3..79cd96480 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -166,7 +166,7 @@ define([ this.btnAddPivot = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-ic-docspell', + iconCls: 'btn-add-pivot', caption: this.txtCreate, disabled : true }); @@ -174,7 +174,7 @@ define([ this.btnPivotLayout = new Common.UI.Button({ cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-insertimage', + iconCls : 'btn-pivot-layout', caption : this.capLayout, disabled : true, menu : new Common.UI.Menu({ @@ -192,7 +192,7 @@ define([ this.btnPivotBlankRows = new Common.UI.Button({ cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-insertimage', + iconCls : 'btn-blank-rows', caption : this.capBlankRows, disabled : true, menu : new Common.UI.Menu({ @@ -206,7 +206,7 @@ define([ this.btnPivotSubtotals = new Common.UI.Button({ cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-insertimage', + iconCls : 'btn-subtotals', caption : this.capSubtotals, disabled : true, menu : new Common.UI.Menu({ @@ -221,7 +221,7 @@ define([ this.btnPivotGrandTotals = new Common.UI.Button({ cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-insertimage', + iconCls : 'btn-grand-totals', caption : this.capGrandTotals, disabled : true, menu : new Common.UI.Menu({ @@ -237,7 +237,7 @@ define([ this.btnRefreshPivot = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-ic-docspell', + iconCls: 'btn-update-pivot', caption: this.txtRefresh, disabled : true });