Merge pull request #2279 from hypothesis/annotator-css-separation

Keep app css and inject css separate

h/static/styles/bucket-bar.scss → h/static/styles/annotator/bucket-bar.scss

-@import 'base';
+@import '../base';
 
 .annotator-bucket-bar {
   background: hsla(0, 0, 0, .1);

h/static/styles/inject.scss → h/static/styles/annotator/inject.scss

-@import 'base';
-@import 'mixins/icons';
-@import 'compass/css3/user-interface';
-@import 'compass/layout/stretching';
-@import 'compass/reset/utilities';
+@import '../base';
+@import '../mixins/icons';
 
 $base-font-size: 14px;
 
@@ -89,8 +86,8 @@ $base-font-size: 14px;
 
 // Sidebar
 .annotator-frame {
-  @import 'reset';
-  @import 'bucket-bar';
+  @import '../reset';
+  @import './bucket-bar';
   @include nested-reset;
   @include reset-box-model;
   @include user-select(none);

h/static/styles/pdfjs-overrides.scss → h/static/styles/annotator/pdfjs-overrides.scss

-@import "variables";
+@import "../variables";
 
 // Newer versions of PDFjs use apply a transparency to the textLayer element.
 // In order for our highlights to be visible we need to use solid colors. The

h/static/styles/base.scss

 @import "compass/css3";
-@import "variables";
+@import 'compass/reset/utilities';
+
+@import "./variables";
 
 /* Style input placeholders */
 @mixin placeholder {