Permalink
Browse files

Footnote conflict merge

  • Loading branch information...
2 parents 6135d24 + e59d9a9 commit 628f817bd184379869e47e450c61657848e8bea4 @antonvs committed Sep 14, 2011
Showing with 14 additions and 4 deletions.
  1. +7 −0 www/exactedits.css
  2. +1 −1 www/exactedits.tpl
  3. +6 −3 www/services.tpl
View
@@ -169,6 +169,13 @@ dl.references p {
padding-bottom:1em;
}
+/* footnote references */
+.fn {
+ text-decoration:none;
+ font-size:small;
+ font-weight:normal;
+}
+
.dictionary-def {
border:dashed darkgrey 2px;
margin:1em;
View
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<bind tag="exact-edits"><span class="exact-edits">Exact Edits</span></bind>
-<bind tag="fn"><sup><a name="footref-$(content)" href="#foot-$(content)">[<content/>]</a></sup></bind>
+<bind tag="fn"><sup><a name="footref-$(content)" href="#foot-$(content)" class="fn">[<content/>]</a></sup></bind>
<html>
<apply template="page-head"/>
<body>
View
@@ -1,6 +1,9 @@
<apply template="exactedits">
<bind tag="subtitle">: Services</bind>
+<p>To come</p>
+<div style="display:none"><!-- delete this line and the closing tag at the end to make the contents visible -->
+
<h2>Services: The editing process</h2>
<p>
@@ -198,12 +201,12 @@ The three kinds of editing outlined by Butcher, <i>J Copy-editing: The Cambridge
Publishers</i> Cambridge University Press </apply>
<apply template="footnote">
-
-<apply template="footnote">
<bind tag="number">2</bind>
Much of the structure and contents of this section was sourced from the manual of McGillivray Linnegar Associates’
<i>Basic Copy Editing and Proofreading</i> course. </apply>
-</apply><!-- close outer footnotes element -->
+</apply><!-- close footnotes section -->
+
+</div><!-- delete this line and the opening tag at the top to make the contents visible -->
</apply><!-- close page template -->

0 comments on commit 628f817

Please sign in to comment.