diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png index 46aca94a1..5982df154 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 4b49b6d5d..b5e8401df 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 2484f0643..2c6254779 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -281,3 +281,4 @@ .button-normal-icon(review-deny, 15, @toolbar-big-icon-size); .button-normal-icon(review-next, 16, @toolbar-big-icon-size); .button-normal-icon(review-prev, 17, @toolbar-big-icon-size); +.button-normal-icon(btn-dropcap, 18, @toolbar-big-icon-size); diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template index ddcfae844..01d818c01 100644 --- a/apps/documenteditor/main/app/template/Toolbar.template +++ b/apps/documenteditor/main/app/template/Toolbar.template @@ -146,10 +146,7 @@
-
- -
-
+
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index d51c17793..842f79a02 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -571,7 +571,7 @@ define([ this.btnDropCap = new Common.UI.Button({ id: 'tlb-btn-dropcap', - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-dropcap', caption: me.capBtnInsDropcap, menu: new Common.UI.Menu({ diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index eaaca90ff..5f356d938 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -266,7 +266,6 @@ .button-normal-icon(btn-colorschemas, 44, @toolbar-icon-size); .button-normal-icon(btn-hidebars, 47, @toolbar-icon-size); .button-normal-icon(btn-settings, 48, @toolbar-icon-size); -.button-normal-icon(btn-dropcap, 50, @toolbar-icon-size); //.toolbar-btn-icon(btn-bold, 5, @toolbar-icon-size); .button-normal-icon(btn-zoomup, 57, @toolbar-icon-size); .button-normal-icon(btn-zoomdown, 58, @toolbar-icon-size); @@ -292,8 +291,9 @@ //.button-normal-icon(btn-inserthyperlink, 38, @toolbar-icon-size); //.button-normal-icon(btn-insertshape, 43, @toolbar-icon-size); //.button-normal-icon(btn-insertchart, 45, @toolbar-icon-size); -//.button-normal-icon(btn-insertequation, 53, @toolbar-icon-size); //.button-normal-icon(btn-text, 46, @toolbar-icon-size); +//.button-normal-icon(btn-insertequation, 53, @toolbar-icon-size); +//.button-normal-icon(btn-dropcap, 50, @toolbar-icon-size); //.button-normal-icon(btn-ic-doclang, 67, @toolbar-icon-size); //.button-normal-icon(btn-notes, 78, @toolbar-icon-size); //.button-normal-icon(review-prev, 79, @toolbar-icon-size);