Commit 928842d8 authored by Aron Carroll's avatar Aron Carroll

Remove conflicting class names from annotations

Section, header and footer should be distinct, instead we just use the
cascade in the stylesheet to override the margins.
parent e6612072
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
&:focus { outline: 0; } &:focus { outline: 0; }
} }
.annotation-section { .annotation-section,
.annotation-header,
.annotation-footer {
@include pie-clearfix; @include pie-clearfix;
margin: .8em 0; margin: .8em 0;
} }
......
<header class="annotation-header annotation-section"> <header class="annotation-header">
<!-- Deletion notice --> <!-- Deletion notice -->
<span ng-if="!vm.editing && vm.annotation.deleted">Annotation deleted.</span> <span ng-if="!vm.editing && vm.annotation.deleted">Annotation deleted.</span>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</header> </header>
<!-- Excerpts --> <!-- Excerpts -->
<section class="annotation-target annotation-section" <section class="annotation-section"
ng-repeat="target in vm.annotation.target track by $index"> ng-repeat="target in vm.annotation.target track by $index">
<blockquote class="annotation-quote" <blockquote class="annotation-quote"
ng-hide="target.diffHTML && vm.showDiff" ng-hide="target.diffHTML && vm.showDiff"
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
</a> </a>
</div> </div>
<footer class="annotation-footer annotation-actions annotation-section" <footer class="annotation-footer annotation-actions"
ng-if="!vm.editing && vm.annotation.id"> ng-if="!vm.editing && vm.annotation.id">
<a class="small magicontrol" href="" title="Reply" <a class="small magicontrol" href="" title="Reply"
ng-click="vm.reply()" ng-click="vm.reply()"
......
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