Merge pull request #770 from 18F/734-cleanup

Account for floating nav offset in more places
18F · Dec 15, 2017 · b370b40 · b370b40
2 parents 1b79959 + 40c95bc
commit b370b40
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/ui/components/document/footnotes.js b/ui/components/document/footnotes.js
@@ -8,6 +8,7 @@ import Footnote from '../node-renderers/footnote';
 export function Footnotes({ id, footnotes }) {
   return (
     <div className="bottom-footnotes" id={id}>
+      <hr className="bottom-footnotes-border" />
       { footnotes.map(fn => <Footnote key={fn.identifier} docNode={fn} />) }
     </div>
   );

diff --git a/ui/components/node-renderers/table/tfoot.js b/ui/components/node-renderers/table/tfoot.js
@@ -14,7 +14,7 @@ function deriveColspan(docNode) {
 
 export default function Tfoot({ docNode }) {
   const footnotes = docNode.meta.descendantFootnotes.map(ft => (
-    <div className="clearfix" key={ft.identifier} id={`${ft.identifier}-table`}>
+    <div className="clearfix footnote" key={ft.identifier} id={`${ft.identifier}-table`}>
       <div className="footnote-marker">{ft.marker}</div>
       <div className="footnote-text">{ renderContents(ft.content) }</div>
     </div>

diff --git a/ui/css/module/_document.scss b/ui/css/module/_document.scss
@@ -115,7 +115,10 @@
 @media #{$on-mobile} {
   $size-of-floating-nav: 3rem;
 
-  .node-section::before {
+  .bottom-footnotes::before,
+  .node-policy::before,
+  .node-section::before,
+  .table-footer .footnote::before {
     content: ' ';
     display: block;
     height: $size-of-floating-nav;

diff --git a/ui/css/module/_footnotes.scss b/ui/css/module/_footnotes.scss
@@ -111,9 +111,13 @@ $footnote-vertical-margin: 24px;
 }
 
 .bottom-footnotes {
-  border-top: 1px solid $color-blue;
-  margin-top: 2.5em;
-  padding-top: .75em;
+  margin-top: 2rem;
+
+  .bottom-footnotes-border {
+    border: none;
+    border-bottom: 1px solid $color-blue;
+    margin-bottom: .75rem;
+  }
 
   .node-footnote {
     @extend .clearfix;