Skip to content

C
coopwire-hypothesis
Commit 0ff269b8 authored by Randall Leeds's avatar Randall Leeds
Browse files
Options

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

Fix jumping search icon when loading extension on stream
parents 9b19f965 8f7af991
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 16 deletions
h/static/styles/inject.scss
View file @ 0ff269b8
@import 'base'; @import 'base';
@import 'mixins/icons';
@import 'compass/css3/user-interface'; @import 'compass/css3/user-interface';
@import 'compass/layout/stretching'; @import 'compass/layout/stretching';
@import 'compass/reset/utilities'; @import 'compass/reset/utilities';
...@@ -132,10 +131,6 @@ $base-font-size: 14px; ...@@ -132,10 +131,6 @@ $base-font-size: 14px;
z-index: 3; z-index: 3;
position: relative; position: relative;
} }
@include icons {
font-family: 'h';
}
} }
.annotator-no-transition { .annotator-no-transition {
......
h/static/styles/simple-search.scss
View file @ 0ff269b8
...@@ -16,20 +16,22 @@ ...@@ -16,20 +16,22 @@
box-sizing: border-box; box-sizing: border-box;
} }
.simple-search-icon { @include icons {
float: left; &.simple-search-icon {
display: inline; float: left;
font-size: 1.1em; display: inline;
line-height: 2; font-size: 1.1em;
margin-left: -100%; line-height: 2;
position: relative; margin-left: -100%;
right: 19 / 14 * 1em; position: relative;
right: 19 / 14 * 1em;
:not(:focus) ~ & {
color: $gray-lighter;
} }
} }
:not(:focus) ~ .simple-search-icon {
color: $gray-lighter;
}
.simple-search-input { .simple-search-input {
float: left; float: left;
outline: none; outline: none;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment