be more careful with app resets

Keep broad resets namespaced and out of common.scss.

hypothesis/sass/app.scss

 @import 'common';
 @import 'compass';
+@import 'compass/reset/utilities';
 
 /* Annotator styles */
 
@@ -126,6 +127,12 @@ $iconset: iconset_wireframe;
   @include icon_resets;
   background-image: url("../images/#{$icon}"); }
 
+// Styles for base annotator elements
+.annotator-listing {
+  @include reset-box-model;
+  @include reset-list-style;
+}
+
 // Styles for the sidebar
 .hyp-sidebar {
   @include single-transition(all, 0.6s, ease-in-out);

hypothesis/sass/common.scss

@@ -54,59 +54,35 @@ $gutter: 24;
   font-size: 13/$em;
   line-height: 14/13*1em;
 }
-.small { @include small; }
 
 @mixin normal {
   font-size: 1em;
 }
-.normal { @include normal; }
 
 @mixin big {
   font-size: 23/$em;
   line-height: 24/23*1em;
 }
-.big { @include big; }
 
 @mixin large {
   font-size: 27/$em;
   line-height: 36/27*1em;
 }
-.large { @include large; }
 
 @mixin huge {
   font-size: 44/$em;
   line-height: 48/44*1em;
 }
-.huge { @include huge; }
 
 @mixin enormous {
   font-size: 72/$em;
   line-height: 72/72*1em;
 }
-.enormous { @include enormous; }
 
 @mixin gigantic {
   font-size: 116/$em;
   line-height: 120/116*1em;
 }
-.gigantic { @include gigantic; }
-
-/* Typography */
-
-article p {
-  -webkit-hyphens: auto;
-     -moz-hyphens: auto;
-          hyphens: auto;
-}
-
-em { font-style: italic; }
-
-h1 { @extend .large; }
-h2 { @extend .big; }
-
-h1, h2, h3 {
-  font-weight: 700;
-}
 
 /* Shadows */
 @mixin smallshadow($a: 2px, $b: 2px, $c: .1) {

hypothesis/sass/site.scss

@@ -19,6 +19,9 @@ article {
 
   p {
     margin: 1em 0;
+    -webkit-hyphens: auto;
+       -moz-hyphens: auto;
+            hyphens: auto;
   }
 }
 
@@ -32,11 +35,20 @@ body {
 
 }
 
+em { font-style: italic; }
+
 h1, h2, h3, h4 {
   color: darken($gray-light, 15%);
   margin: .33em 0;
 }
 
+h1, h2, h3 {
+  font-weight: 700;
+}
+
+h1 { @include large; }
+h2 { @include big; }
+
 h1, form {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
@@ -50,7 +62,7 @@ section {
 }
 
 span.error {
-  @extend .small;
+  @include small;
 }
 
 .deform button,
@@ -158,7 +170,7 @@ span.error {
 }
 
 #toolbar {
-  @extend .small;
+  @include small;
   @include box-shadow(
     $gray-light 0 0 .5em,
     desaturate(lighten($blue, 25%), 85%) 0 0 6em -3em inset