Merge pull request #1831 from hypothesis/1808-fix-cc0-message-style-alt

Remove negative margin on thread reply counts.

h/static/styles/annotations.scss

@@ -6,7 +6,6 @@
   font-family: $sans-font-family;
   font-weight: 300;
   position: relative;
-  @include pie-clearfix;
 
   &:hover .annotation-timestamp, &:hover .reply-count {
     color: $link-color;
@@ -20,10 +19,15 @@
   &:focus { outline: 0; }
 }
 
-.annotation-header { margin-bottom: .8em }
-.annotation-section { margin: .8em 0 }
-.annotation-target { margin: .8em 0 }
-.annotation-footer { margin-top: .8em }
+.annotation-section,
+.annotation-header,
+.annotation-footer {
+  @include pie-clearfix;
+  margin: .8em 0;
+}
+
+.annotation-header { margin-top: 0 }
+.annotation-footer { margin-bottom: 0 }
 
 .annotation-user {
   color: $text-color;

h/static/styles/threads.scss

@@ -22,6 +22,7 @@ $threadexp-width: .6em;
 }
 
 .thread {
+  @include pie-clearfix;
   cursor: pointer;
   position: relative;
 
@@ -101,7 +102,7 @@ $threadexp-width: .6em;
 }
 
 .thread-message {
-  margin-bottom: .8em;
+  margin-bottom: .5em;
 }
 
 .thread-deleted {
@@ -109,11 +110,6 @@ $threadexp-width: .6em;
   margin-bottom: 2.8em;
 }
 
-.thread-reply {
-  margin-top: -2.153em;
-  margin-bottom: .8em;
-}
-
 .thread-message:hover + .thread-reply {
   .reply-count {
     color: $link-color;

h/templates/client/annotation.html

@@ -42,7 +42,7 @@
 </header>
 
 <!-- Excerpts -->
-<section class="annotation-target"
+<section class="annotation-section"
          ng-repeat="target in vm.annotation.target track by $index">
   <blockquote class="annotation-quote"
               ng-hide="target.diffHTML && vm.showDiff"