Fix icon fonts in the simple-search bar

Added a readable class name to the search icon .icon-search and
regenerated the icomoon css file.

h/static/fonts/selection.json

@@ -15,7 +15,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 89,
+				"order": 1,
 				"id": 13,
 				"prevSize": 32,
 				"code": 46,
@@ -40,7 +40,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 90,
+				"order": 2,
 				"id": 14,
 				"prevSize": 32,
 				"code": 47,
@@ -64,7 +64,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 91,
+				"order": 3,
 				"id": 15,
 				"prevSize": 32,
 				"code": 51,
@@ -88,7 +88,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 92,
+				"order": 4,
 				"id": 16,
 				"prevSize": 32,
 				"code": 54,
@@ -113,7 +113,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 93,
+				"order": 5,
 				"id": 17,
 				"prevSize": 32,
 				"code": 56,
@@ -136,7 +136,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 94,
+				"order": 6,
 				"id": 18,
 				"prevSize": 32,
 				"code": 57,
@@ -158,7 +158,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 95,
+				"order": 7,
 				"id": 25,
 				"prevSize": 32,
 				"code": 63,
@@ -180,7 +180,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 96,
+				"order": 8,
 				"id": 26,
 				"prevSize": 32,
 				"code": 60,
@@ -202,7 +202,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 97,
+				"order": 9,
 				"id": 27,
 				"prevSize": 32,
 				"code": 57344,
@@ -224,7 +224,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 98,
+				"order": 10,
 				"id": 28,
 				"prevSize": 32,
 				"code": 57345,
@@ -246,7 +246,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 99,
+				"order": 11,
 				"id": 29,
 				"prevSize": 32,
 				"code": 57346,
@@ -269,7 +269,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 100,
+				"order": 12,
 				"id": 30,
 				"prevSize": 32,
 				"code": 57347,
@@ -291,7 +291,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 101,
+				"order": 13,
 				"id": 37,
 				"prevSize": 32,
 				"code": 57354,
@@ -313,7 +313,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 102,
+				"order": 14,
 				"id": 38,
 				"prevSize": 32,
 				"code": 57355,
@@ -335,7 +335,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 103,
+				"order": 15,
 				"id": 39,
 				"prevSize": 32,
 				"code": 57356,
@@ -357,7 +357,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 104,
+				"order": 16,
 				"id": 40,
 				"prevSize": 32,
 				"code": 57358,
@@ -379,7 +379,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 105,
+				"order": 17,
 				"id": 41,
 				"prevSize": 32,
 				"code": 57357,
@@ -403,7 +403,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 106,
+				"order": 18,
 				"id": 42,
 				"prevSize": 32,
 				"code": 57359,
@@ -427,7 +427,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 107,
+				"order": 19,
 				"id": 49,
 				"prevSize": 32,
 				"code": 57362,
@@ -452,7 +452,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 108,
+				"order": 20,
 				"id": 50,
 				"prevSize": 32,
 				"code": 61694,
@@ -475,7 +475,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 109,
+				"order": 21,
 				"id": 51,
 				"prevSize": 32,
 				"code": 57366,
@@ -500,7 +500,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 110,
+				"order": 22,
 				"id": 52,
 				"prevSize": 32,
 				"code": 61648,
@@ -524,7 +524,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 111,
+				"order": 23,
 				"id": 53,
 				"prevSize": 32,
 				"code": 57367,
@@ -547,7 +547,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 112,
+				"order": 24,
 				"id": 54,
 				"prevSize": 32,
 				"code": 57368,
@@ -569,7 +569,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 113,
+				"order": 25,
 				"id": 61,
 				"prevSize": 32,
 				"code": 57363,
@@ -591,7 +591,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 114,
+				"order": 26,
 				"id": 62,
 				"prevSize": 32,
 				"code": 57374,
@@ -613,7 +613,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 115,
+				"order": 27,
 				"id": 7,
 				"prevSize": 32,
 				"code": 39,
@@ -635,7 +635,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 116,
+				"order": 28,
 				"id": 8,
 				"prevSize": 32,
 				"code": 40,
@@ -657,7 +657,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 117,
+				"order": 29,
 				"id": 9,
 				"prevSize": 32,
 				"code": 41,
@@ -679,7 +679,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 118,
+				"order": 30,
 				"id": 10,
 				"prevSize": 32,
 				"code": 43,
@@ -701,7 +701,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 119,
+				"order": 31,
 				"id": 11,
 				"prevSize": 32,
 				"code": 44,
@@ -725,7 +725,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 120,
+				"order": 32,
 				"id": 12,
 				"prevSize": 32,
 				"code": 45,
@@ -747,7 +747,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 121,
+				"order": 33,
 				"id": 23,
 				"prevSize": 32,
 				"code": 42,
@@ -769,7 +769,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 122,
+				"order": 34,
 				"id": 24,
 				"prevSize": 32,
 				"code": 62,
@@ -792,7 +792,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 123,
+				"order": 35,
 				"id": 35,
 				"prevSize": 32,
 				"code": 57350,
@@ -814,7 +814,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 124,
+				"order": 36,
 				"id": 36,
 				"prevSize": 32,
 				"code": 57353,
@@ -838,7 +838,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 125,
+				"order": 37,
 				"id": 47,
 				"prevSize": 32,
 				"code": 61550,
@@ -864,7 +864,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 126,
+				"order": 38,
 				"id": 48,
 				"prevSize": 32,
 				"code": 57361,
@@ -886,7 +886,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 127,
+				"order": 39,
 				"id": 59,
 				"prevSize": 32,
 				"code": 57372,
@@ -908,7 +908,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 128,
+				"order": 40,
 				"id": 58,
 				"prevSize": 32,
 				"code": 57369,
@@ -930,7 +930,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 129,
+				"order": 41,
 				"id": 57,
 				"prevSize": 32,
 				"code": 57370,
@@ -953,7 +953,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 130,
+				"order": 42,
 				"id": 56,
 				"prevSize": 32,
 				"code": 57365,
@@ -975,7 +975,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 131,
+				"order": 43,
 				"id": 60,
 				"prevSize": 32,
 				"code": 57373,
@@ -997,7 +997,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 132,
+				"order": 44,
 				"id": 55,
 				"prevSize": 32,
 				"code": 57371,
@@ -1020,7 +1020,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 133,
+				"order": 45,
 				"id": 43,
 				"prevSize": 32,
 				"code": 57376,
@@ -1042,7 +1042,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 134,
+				"order": 46,
 				"id": 44,
 				"prevSize": 32,
 				"code": 57360,
@@ -1064,7 +1064,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 135,
+				"order": 47,
 				"id": 45,
 				"prevSize": 32,
 				"code": 57364,
@@ -1088,7 +1088,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 136,
+				"order": 48,
 				"id": 46,
 				"prevSize": 32,
 				"code": 61552,
@@ -1111,7 +1111,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 137,
+				"order": 49,
 				"id": 34,
 				"prevSize": 32,
 				"code": 57349,
@@ -1133,7 +1133,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 138,
+				"order": 50,
 				"id": 33,
 				"prevSize": 32,
 				"code": 57348,
@@ -1155,7 +1155,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 139,
+				"order": 51,
 				"id": 32,
 				"prevSize": 32,
 				"code": 57352,
@@ -1177,7 +1177,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 140,
+				"order": 52,
 				"id": 31,
 				"prevSize": 32,
 				"code": 57351,
@@ -1202,7 +1202,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 141,
+				"order": 53,
 				"id": 19,
 				"prevSize": 32,
 				"code": 58,
@@ -1229,7 +1229,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 142,
+				"order": 54,
 				"id": 20,
 				"prevSize": 32,
 				"code": 61,
@@ -1252,7 +1252,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 143,
+				"order": 55,
 				"id": 21,
 				"prevSize": 32,
 				"code": 53,
@@ -1275,7 +1275,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 144,
+				"order": 56,
 				"id": 22,
 				"prevSize": 32,
 				"code": 55,
@@ -1298,7 +1298,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 145,
+				"order": 57,
 				"id": 6,
 				"prevSize": 32,
 				"code": 38,
@@ -1320,7 +1320,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 146,
+				"order": 58,
 				"id": 5,
 				"prevSize": 32,
 				"code": 37,
@@ -1340,7 +1340,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 147,
+				"order": 59,
 				"id": 4,
 				"prevSize": 32,
 				"code": 36,
@@ -1360,7 +1360,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 148,
+				"order": 60,
 				"id": 3,
 				"prevSize": 32,
 				"code": 35,
@@ -1388,7 +1388,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 149,
+				"order": 61,
 				"id": 2,
 				"prevSize": 32,
 				"code": 34,
@@ -1407,7 +1407,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 150,
+				"order": 62,
 				"id": 1,
 				"prevSize": 32,
 				"code": 61440,
@@ -1428,7 +1428,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 151,
+				"order": 63,
 				"id": 0,
 				"prevSize": 32,
 				"code": 58880,
@@ -1451,7 +1451,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 152,
+				"order": 64,
 				"id": 0,
 				"prevSize": 32,
 				"code": 58881,
@@ -1472,7 +1472,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 153,
+				"order": 65,
 				"id": 0,
 				"prevSize": 32,
 				"code": 58882,
@@ -1498,7 +1498,7 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 154,
+				"order": 66,
 				"id": 114,
 				"prevSize": 32,
 				"code": 58883,
@@ -1524,7 +1524,7 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 155,
+				"order": 67,
 				"id": 113,
 				"prevSize": 32,
 				"code": 58884,
@@ -1549,7 +1549,7 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 156,
+				"order": 68,
 				"id": 28,
 				"prevSize": 32,
 				"code": 58885,
@@ -1574,7 +1574,7 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 157,
+				"order": 69,
 				"id": 111,
 				"prevSize": 32,
 				"code": 58886,
@@ -1599,7 +1599,7 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 158,
+				"order": 70,
 				"id": 109,
 				"prevSize": 32,
 				"code": 58887,
@@ -1622,7 +1622,7 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 159,
+				"order": 71,
 				"id": 77,
 				"prevSize": 32,
 				"code": 58888,
@@ -1648,7 +1648,7 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 160,
+				"order": 72,
 				"id": 195,
 				"prevSize": 32,
 				"code": 58889,
@@ -1673,7 +1673,7 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 161,
+				"order": 73,
 				"id": 196,
 				"prevSize": 32,
 				"code": 58890,
@@ -1694,7 +1694,7 @@
 				"grid": 0
 			},
 			"properties": {
-				"order": 162,
+				"order": 74,
 				"id": 0,
 				"prevSize": 32,
 				"code": 58891,
@@ -1713,11 +1713,11 @@
 				"grid": 16
 			},
 			"properties": {
-				"order": 163,
+				"order": 75,
 				"id": 197,
 				"prevSize": 32,
 				"code": 58892,
-				"name": "uniE60C",
+				"name": "search",
 				"ligatures": ""
 			},
 			"setIdx": 1,
@@ -1734,7 +1734,7 @@
 			"metadata": {
 				"fontFamily": "h",
 				"majorVersion": 1,
-				"minorVersion": 0
+				"minorVersion": 1
 			},
 			"showGlyphs": true,
 			"metrics": {
@@ -1746,8 +1746,9 @@
 			"showQuickUse": true,
 			"quickUsageToken": false,
 			"showMetrics": true,
-			"showMetadata": false,
-			"postfix": ""
+			"showMetadata": true,
+			"postfix": "",
+			"showVersion": true
 		},
 		"imagePref": {
 			"color": 0,

h/static/icomoon.css

 @font-face {
 	font-family: 'h';
-	src:url('fonts/h.eot?bykdte');
-	src:url('fonts/h.eot?#iefixbykdte') format('embedded-opentype'),
-		url('fonts/h.woff?bykdte') format('woff'),
-		url('fonts/h.ttf?bykdte') format('truetype'),
-		url('fonts/h.svg?bykdte#h') format('svg');
+	src:url('fonts/h.eot?jsvc9t');
+	src:url('fonts/h.eot?#iefixjsvc9t') format('embedded-opentype'),
+		url('fonts/h.woff?jsvc9t') format('woff'),
+		url('fonts/h.ttf?jsvc9t') format('truetype'),
+		url('fonts/h.svg?jsvc9t#h') format('svg');
 	font-weight: normal;
 	font-style: normal;
 }
@@ -245,6 +245,6 @@
 .icon-link:before {
 	content: "\e60a";
 }
-.icon-uniE60C:before {
+.icon-search:before {
 	content: "\e60c";
 }

h/static/scripts/directives.coffee

@@ -419,8 +419,11 @@ simpleSearch = ['$parse', ($parse) ->
   restrict: 'C'
   template: '''
             <form class="simple-search-form" name="searchBox" ng-submit="dosearch()">
+              <i class="simple-search-icon icon-search"></i>
               <input class="simple-search-input" type="text" ng-model="searchtext" name="searchText" />
-              <button class="simple-search-clear" type="reset" ng-hide="!searchtext" ng-click="reset($event)"></button>
+              <button class="simple-search-clear" type="reset" ng-hide="!searchtext" ng-click="reset($event)">
+                <i class="icon-x"></i>
+              </button>
             </form>
             '''
 ]

h/static/styles/simple-search.scss

 @import "base.scss";
 
 .simple-search-form {
+  position: relative;
   color: $gray;
 
-  @include fonticon("\e60c", left) {
+  &.simple-search-inactive {
+    color: $grayLighter;
+  }
+}
+
+.simple-search-icon {
   position: absolute;
   top: 50%;
   left: 8px;
   margin-top: -0.5em;
   font-size: 14px;
   line-height: 1;
-  }
-
-  &.simple-search-inactive {
-    color: $grayLighter;
-  }
-
-  position: relative;
 }
 
 .simple-search-input {
@@ -33,7 +32,7 @@
 }
 
 .simple-search-clear {
-  @include fonticon("\36", left) {
+  [class^="icon-"], [class*=" icon-"] {
     position: absolute;
     top: 50%;
     left: 50%;
@@ -50,10 +49,12 @@
   color: #fff;
   width: 16px;
   height: 16px;
+  padding: 0;
   margin-top: -8px;
-  font-size: 8px;
+  font-size: 9px;
   text-align: center;
   text-shadow: none;
+  @include box-shadow(none);
 
   &:focus, &:hover, &:active:not([disabled]) {
     @include transition(background-color 200ms ease-in);