Fix icons for spellcheck and special paste

apps/common/main/lib/view/LanguageDialog.js

@@ -86,13 +86,13 @@ define([
             template: _.template([
                 '<span class="input-group combobox <%= cls %> combo-langs" id="<%= id %>" style="<%= style %>">',
                     '<input type="text" class="form-control">',
-                    '<span class="icon input-icon spellcheck-lang img-toolbarmenu"></span>',
+                    '<span class="icon input-icon spellcheck-lang toolbar__icon btn-ic-docspell"></span>',
                     '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
                     '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
                         '<% _.each(items, function(item) { %>',
                         '<li id="<%= item.id %>" data-value="<%= item.value %>">',
                             '<a tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= item.value %>">',
-                                '<i class="icon <% if (item.spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
+                                '<i class="icon <% if (item.spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                                 '<%= scope.getDisplayValue(item) %>',
                             '</a>',
                         '</li>',

apps/common/main/resources/less/asc-mixins.less

@@ -228,31 +228,6 @@
     }
 }
 
-@toolbarmenu-sprite-width: 60px;
-.img-toolbarmenu
-{
-    background-image: if(@icon-src-base64, data-uri(%("%s",'@{app-image-path}/toolbar-menu.png')), ~"url(@{app-image-const-path}/toolbar-menu.png)");
-    background-repeat: no-repeat;
-
-    @media only screen {
-        @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
-                    (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
-                    (min-resolution: 144dpi) and (max-resolution: 191dpi)
-        {
-            background-image: ~"url(@{app-image-const-path}/toolbar-menu@1.5x.png)";
-            background-size:  @toolbarmenu-sprite-width auto;
-        }
-
-        @media (-webkit-min-device-pixel-ratio: 2),
-                (min-resolution: 2dppx),
-                (min-resolution: 192dpi)
-        {
-            background-image: ~"url(@{app-image-const-path}/toolbar-menu@2x.png)";
-            background-size:  @toolbarmenu-sprite-width auto;
-        }
-    }
-}
-
 @img-colorpicker-width: 205px;
 .img-colorpicker, .hsb-colorpicker .empty-color:before
 {

apps/documenteditor/main/app/view/DocumentHolder.js

@@ -633,7 +633,7 @@ define([
 
                     me.btnSpecialPaste = new Common.UI.Button({
                         cls         : 'btn-toolbar',
-                        iconCls     : 'btn-paste',
+                        iconCls     : 'toolbar__icon btn-paste',
                         menu        : new Common.UI.Menu({items: []})
                     });
                     me.btnSpecialPaste.render($('#id-document-holder-btn-special-paste')) ;
@@ -2804,7 +2804,7 @@ define([
 
             var langTemplate = _.template([
                 '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value %>" class="<% if (checked) { %> checked <% } %>">',
-                '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
+                '<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                 '<%= caption %>',
                 '</a>'
             ].join(''));

apps/documenteditor/main/app/view/Statusbar.js

@@ -234,7 +234,7 @@ define([
                     restoreHeight: 285,
                     itemTemplate: _.template([
                         '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',
-                            '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
+                            '<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                             '<%= caption %>',
                         '</a>'
                     ].join('')),

apps/presentationeditor/main/app/template/LeftMenu.template

@@ -6,7 +6,7 @@
         <button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
         <button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
         <!-- /** coauthoring end **/ -->
-        <button id="left-btn-plugins" class="btn btn-category" content-target=""><i class="icon img-toolbarmenu btn-menu-plugin">&nbsp;</i></button>
+        <button id="left-btn-plugins" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-plugin">&nbsp;</i></button>
         <button id="left-btn-support" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
         <button id="left-btn-about" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
     </div>

apps/presentationeditor/main/app/view/DocumentHolder.js

@@ -1506,7 +1506,7 @@ define([
 
                     me.btnSpecialPaste = new Common.UI.Button({
                         cls         : 'btn-toolbar',
-                        iconCls     : 'btn-paste',
+                        iconCls     : 'toolbar__icon btn-paste',
                         menu        : new Common.UI.Menu({items: []})
                     });
                     me.btnSpecialPaste.render($('#id-document-holder-btn-special-paste')) ;
@@ -2179,7 +2179,7 @@ define([
 
             var langTemplate = _.template([
                 '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value %>" class="<% if (checked) { %> checked <% } %>">',
-                '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
+                '<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                 '<%= caption %>',
                 '</a>'
             ].join(''));

apps/presentationeditor/main/app/view/Statusbar.js

@@ -254,7 +254,7 @@ define([
                     restoreHeight: 285,
                     itemTemplate: _.template([
                         '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',
-                        '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
+                        '<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                         '<%= caption %>',
                         '</a>'
                     ].join('')),

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

@@ -2278,7 +2278,7 @@ define([
 
                 me.btnSpecialPaste = new Common.UI.Button({
                     cls         : 'btn-toolbar',
-                    iconCls     : 'btn-paste',
+                    iconCls     : 'toolbar__icon btn-paste',
                     menu        : new Common.UI.Menu({items: []})
                 });
                 me.btnSpecialPaste.render($('#id-document-holder-btn-special-paste')) ;
@@ -2424,7 +2424,7 @@ define([
 
                 me.btnAutoCorrectPaste = new Common.UI.Button({
                     cls         : 'btn-toolbar',
-                    iconCls     : 'btn-paste',
+                    iconCls     : 'toolbar__icon btn-paste',
                     menu        : new Common.UI.Menu({items: []})
                 });
                 me.btnAutoCorrectPaste.render($('#id-document-holder-btn-autocorrect-paste')) ;