Merge pull request #1834 from hypothesis/1764-inject-conflicts

Fix jumping search icon when loading extension on stream

h/static/styles/inject.scss

 @import 'base';
-@import 'mixins/icons';
 @import 'compass/css3/user-interface';
 @import 'compass/layout/stretching';
 @import 'compass/reset/utilities';
@@ -132,10 +131,6 @@ $base-font-size: 14px;
     z-index: 3;
     position: relative;
   }
-
-  @include icons {
-    font-family: 'h';
-  }
 }
 
 .annotator-no-transition {

h/static/styles/simple-search.scss

@@ -16,20 +16,22 @@
   box-sizing: border-box;
 }
 
-.simple-search-icon {
-  float: left;
-  display: inline;
-  font-size: 1.1em;
-  line-height: 2;
-  margin-left: -100%;
-  position: relative;
-  right: 19 / 14 * 1em;
-
-  :not(:focus) ~ & {
-    color: $gray-lighter;
+@include icons {
+  &.simple-search-icon {
+    float: left;
+    display: inline;
+    font-size: 1.1em;
+    line-height: 2;
+    margin-left: -100%;
+    position: relative;
+    right: 19 / 14 * 1em;
   }
 }
 
+:not(:focus) ~ .simple-search-icon {
+  color: $gray-lighter;
+}
+
 .simple-search-input {
   float: left;
   outline: none;