fixes #2081 force icon-menu and icon-calendar names

admin/themes/default/fontello/config.json

@@ -134,7 +134,7 @@
     },
     {
       "uid": "559647a6f430b3aeadbecd67194451dd",
-      "css": "menu-1",
+      "css": "menu",
       "code": 59401,
       "src": "fontawesome"
     },
@@ -164,7 +164,7 @@
     },
     {
       "uid": "531bc468eecbb8867d822f1c11f1e039",
-      "css": "calendar-1",
+      "css": "calendar",
       "code": 59416,
       "src": "fontawesome"
     },

admin/themes/default/fontello/css/fontello-codes.css

@@ -11,7 +11,7 @@
 .icon-folder-open:before { content: '\e806'; } /* '' */
 .icon-brush:before { content: '\e807'; } /* '' */
 .icon-flow-branch:before { content: '\e808'; } /* '' */
-.icon-menu-1:before { content: '\e809'; } /* '' */
+.icon-menu:before { content: '\e809'; } /* '' */
 .icon-star-half:before { content: '\e80a'; } /* '' */
 .icon-user-add:before { content: '\e80b'; } /* '' */
 .icon-cw:before { content: '\e80c'; } /* '' */
@@ -26,7 +26,7 @@
 .icon-key:before { content: '\e815'; } /* '' */
 .icon-network:before { content: '\e816'; } /* '' */
 .icon-info-circled-1:before { content: '\e817'; } /* '' */
-.icon-calendar-1:before { content: '\e818'; } /* '' */
+.icon-calendar:before { content: '\e818'; } /* '' */
 .icon-ok:before { content: '\e819'; } /* '' */
 .icon-help-circled:before { content: '\e81a'; } /* '' */
 .icon-logout:before { content: '\e81b'; } /* '' */

admin/themes/default/fontello/css/fontello-ie7-codes.css

@@ -11,7 +11,7 @@
 .icon-folder-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-brush { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-flow-branch { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
-.icon-menu-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-star-half { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-user-add { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
@@ -26,7 +26,7 @@
 .icon-key { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-network { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-info-circled-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
-.icon-calendar-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-calendar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-ok { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-help-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }

admin/themes/default/fontello/css/fontello-ie7.css

@@ -22,7 +22,7 @@
 .icon-folder-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-brush { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-flow-branch { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
-.icon-menu-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-star-half { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-user-add { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
@@ -37,7 +37,7 @@
 .icon-key { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-network { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-info-circled-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
-.icon-calendar-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-calendar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-ok { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-help-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }

admin/themes/default/fontello/css/fontello.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?54720657');
-  src: url('../font/fontello.eot?54720657#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff2?54720657') format('woff2'),
-       url('../font/fontello.woff?54720657') format('woff'),
-       url('../font/fontello.ttf?54720657') format('truetype'),
-       url('../font/fontello.svg?54720657#fontello') format('svg');
+  src: url('../font/fontello.eot?36276550');
+  src: url('../font/fontello.eot?36276550#iefix') format('embedded-opentype'),
+       url('../font/fontello.woff2?36276550') format('woff2'),
+       url('../font/fontello.woff?36276550') format('woff'),
+       url('../font/fontello.ttf?36276550') format('truetype'),
+       url('../font/fontello.svg?36276550#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?54720657#fontello') format('svg');
+    src: url('../font/fontello.svg?36276550#fontello') format('svg');
   }
 }
 */
@@ -66,7 +66,7 @@
 .icon-folder-open:before { content: '\e806'; } /* '' */
 .icon-brush:before { content: '\e807'; } /* '' */
 .icon-flow-branch:before { content: '\e808'; } /* '' */
-.icon-menu-1:before { content: '\e809'; } /* '' */
+.icon-menu:before { content: '\e809'; } /* '' */
 .icon-star-half:before { content: '\e80a'; } /* '' */
 .icon-user-add:before { content: '\e80b'; } /* '' */
 .icon-cw:before { content: '\e80c'; } /* '' */
@@ -81,7 +81,7 @@
 .icon-key:before { content: '\e815'; } /* '' */
 .icon-network:before { content: '\e816'; } /* '' */
 .icon-info-circled-1:before { content: '\e817'; } /* '' */
-.icon-calendar-1:before { content: '\e818'; } /* '' */
+.icon-calendar:before { content: '\e818'; } /* '' */
 .icon-ok:before { content: '\e819'; } /* '' */
 .icon-help-circled:before { content: '\e81a'; } /* '' */
 .icon-logout:before { content: '\e81b'; } /* '' */

admin/themes/default/fontello/demo.html

@@ -146,11 +146,11 @@
     }
     @font-face {
       font-family: 'fontello';
-      src: url('./font/fontello.eot?95123561');
-      src: url('./font/fontello.eot?95123561#iefix') format('embedded-opentype'),
-           url('./font/fontello.woff?95123561') format('woff'),
-           url('./font/fontello.ttf?95123561') format('truetype'),
-           url('./font/fontello.svg?95123561#fontello') format('svg');
+      src: url('./font/fontello.eot?66378832');
+      src: url('./font/fontello.eot?66378832#iefix') format('embedded-opentype'),
+           url('./font/fontello.woff?66378832') format('woff'),
+           url('./font/fontello.ttf?66378832') format('truetype'),
+           url('./font/fontello.svg?66378832#fontello') format('svg');
       font-weight: normal;
       font-style: normal;
     }
@@ -254,7 +254,7 @@
       </div>
       <div class="row">
         <div class="span3" title="Code: 0xe809">
-          <i class="demo-icon icon-menu-1">&#xe809;</i> <span class="i-name">icon-menu-1</span><span class="i-code">0xe809</span>
+          <i class="demo-icon icon-menu">&#xe809;</i> <span class="i-name">icon-menu</span><span class="i-code">0xe809</span>
         </div>
         <div class="span3" title="Code: 0xe80a">
           <i class="demo-icon icon-star-half">&#xe80a;</i> <span class="i-name">icon-star-half</span><span class="i-code">0xe80a</span>
@@ -305,7 +305,7 @@
           <i class="demo-icon icon-info-circled-1">&#xe817;</i> <span class="i-name">icon-info-circled-1</span><span class="i-code">0xe817</span>
         </div>
         <div class="span3" title="Code: 0xe818">
-          <i class="demo-icon icon-calendar-1">&#xe818;</i> <span class="i-name">icon-calendar-1</span><span class="i-code">0xe818</span>
+          <i class="demo-icon icon-calendar">&#xe818;</i> <span class="i-name">icon-calendar</span><span class="i-code">0xe818</span>
         </div>
       </div>
       <div class="row">

admin/themes/default/fontello/font/fontello.svg

@@ -30,7 +30,7 @@
 
 <glyph glyph-name="flow-branch" unicode="&#xe808;" d="M640 650q0-80-74-110-6-58-28-101t-61-69-68-38-75-26q-42-14-63-22t-47-24-38-40-16-60q70-30 70-110 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 378q-72 34-72 110 0 50 35 85t85 35 85-35 35-85q0-76-72-110l0-204q40 30 138 60 58 18 84 29t51 41 29 76q-70 32-70 108 0 50 35 85t85 35 85-35 35-85z m-588 0q0-28 20-48t48-20 49 20 21 48q0 30-21 50t-49 20-48-20-20-50z m68-668q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z m400 600q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z" horiz-adv-x="640" />
 
-<glyph glyph-name="menu-1" unicode="&#xe809;" d="M857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-14-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" />
+<glyph glyph-name="menu" unicode="&#xe809;" d="M857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-14-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" />
 
 <glyph glyph-name="star-half" unicode="&#xe80a;" d="M464 832v-747l-250-132q-12-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27 0 21 31 26l280 40 126 254q11 23 27 23z" horiz-adv-x="500" />
 
@@ -60,7 +60,7 @@
 
 <glyph glyph-name="info-circled-1" unicode="&#xe817;" d="M454 810q190 2 326-130t140-322q2-190-131-327t-323-141q-190-2-327 131t-139 323q-4 190 130 327t324 139z m52-152q-42 0-65-24t-23-50q-2-28 15-44t49-16q38 0 61 22t23 54q0 58-60 58z m-120-594q30 0 84 26t106 78l-18 24q-48-36-72-36-14 0-4 38l42 160q26 96-22 96-30 0-89-29t-115-75l16-26q52 34 74 34 12 0 0-34l-36-152q-26-104 34-104z" horiz-adv-x="920" />
 
-<glyph glyph-name="calendar-1" unicode="&#xe818;" d="M71-79h161v161h-161v-161z m197 0h178v161h-178v-161z m-197 197h161v178h-161v-178z m197 0h178v178h-178v-178z m-197 214h161v161h-161v-161z m411-411h179v161h-179v-161z m-214 411h178v161h-178v-161z m428-411h161v161h-161v-161z m-214 197h179v178h-179v-178z m-196 482v161q0 7-6 12t-12 6h-36q-7 0-12-6t-6-12v-161q0-7 6-13t12-5h36q7 0 12 5t6 13z m410-482h161v178h-161v-178z m-214 214h179v161h-179v-161z m214 0h161v161h-161v-161z m18 268v161q0 7-5 12t-13 6h-35q-7 0-13-6t-5-12v-161q0-7 5-13t13-5h35q8 0 13 5t5 13z m215 36v-715q0-29-22-50t-50-21h-786q-29 0-50 21t-21 50v715q0 29 21 50t50 21h72v54q0 37 26 63t63 26h36q37 0 63-26t26-63v-54h214v54q0 37 27 63t63 26h35q37 0 64-26t26-63v-54h71q29 0 50-21t22-50z" horiz-adv-x="928.6" />
+<glyph glyph-name="calendar" unicode="&#xe818;" d="M71-79h161v161h-161v-161z m197 0h178v161h-178v-161z m-197 197h161v178h-161v-178z m197 0h178v178h-178v-178z m-197 214h161v161h-161v-161z m411-411h179v161h-179v-161z m-214 411h178v161h-178v-161z m428-411h161v161h-161v-161z m-214 197h179v178h-179v-178z m-196 482v161q0 7-6 12t-12 6h-36q-7 0-12-6t-6-12v-161q0-7 6-13t12-5h36q7 0 12 5t6 13z m410-482h161v178h-161v-178z m-214 214h179v161h-179v-161z m214 0h161v161h-161v-161z m18 268v161q0 7-5 12t-13 6h-35q-7 0-13-6t-5-12v-161q0-7 5-13t13-5h35q8 0 13 5t5 13z m215 36v-715q0-29-22-50t-50-21h-786q-29 0-50 21t-21 50v715q0 29 21 50t50 21h72v54q0 37 26 63t63 26h36q37 0 63-26t26-63v-54h214v54q0 37 27 63t63 26h35q37 0 64-26t26-63v-54h71q29 0 50-21t22-50z" horiz-adv-x="928.6" />
 
 <glyph glyph-name="ok" unicode="&#xe819;" d="M933 534q0-22-16-38l-404-404-76-76q-16-15-38-15t-38 15l-76 76-202 202q-15 16-15 38t15 38l76 76q16 16 38 16t38-16l164-165 366 367q16 16 38 16t38-16l76-76q16-15 16-38z" horiz-adv-x="1000" />