From e83700268c9184ee4d3851ccba463e1166927e19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Robert=20B=C5=82aut?= <listy@blaut.biz> Date: Thu, 16 Jan 2014 21:01:49 +0100 Subject: [PATCH] [ePub Mobi] Removed unnecessary annotations clutter. Make them according typography rules --- librarian/epub/style.css | 22 +++------------------- librarian/epub/xsltAnnotations.xsl | 13 +++++-------- librarian/mobi/style.css | 22 +++------------------- 3 files changed, 11 insertions(+), 46 deletions(-) diff --git a/librarian/epub/style.css b/librarian/epub/style.css index 81ce12b..6b6a047 100644 --- a/librarian/epub/style.css +++ b/librarian/epub/style.css @@ -107,27 +107,10 @@ p text-align: left; } -.annotation-anchor -{ - font-style: normal; - font-weight: normal; - font-size: 0.875em; - display: block; - float: left; - width: 2.5em; - clear: both; -} - .annotation { - margin: 0; - margin-top: 1.5em; -} - -.annotation-body -{ - margin-left: 2.5em; - font-size: 0.875em; + margin-bottom: 0.3em; + text-align: left; } .block @@ -136,6 +119,7 @@ p padding: 1em; } + /* ============= */ /* = Numbering = */ /* ============= */ diff --git a/librarian/epub/xsltAnnotations.xsl b/librarian/epub/xsltAnnotations.xsl index 2deef8d..faba10f 100644 --- a/librarian/epub/xsltAnnotations.xsl +++ b/librarian/epub/xsltAnnotations.xsl @@ -31,16 +31,13 @@ </xsl:template> <xsl:template match="pa|pe|pr|pt" mode="przypis"> - <div xmlns="http://www.w3.org/1999/xhtml" class="annotation"> - <p id="annotation-{@number}" xmlns="http://www.w3.org/1999/xhtml"></p> - <a class="annotation-anchor" href="part{@part}.html#anchor-{@number}" xmlns="http://www.w3.org/1999/xhtml"> - <sup xmlns="http://www.w3.org/1999/xhtml"><xsl:value-of select="@number" /></sup> - </a> - <p class="annotation-body" xmlns="http://www.w3.org/1999/xhtml"> + <p id="annotation-{@number}" class="annotation" xmlns="http://www.w3.org/1999/xhtml"> + <a href="part{@part}.html#anchor-{@number}" xmlns="http://www.w3.org/1999/xhtml"> + <xsl:value-of select="@number" /> + </a>. <xsl:apply-templates /> <xsl:if test="name()='pa'"> [przypis autorski]</xsl:if> - </p> - </div> + </p> </xsl:template> <xsl:template match="slowo_obce"> diff --git a/librarian/mobi/style.css b/librarian/mobi/style.css index bc171c3..cf1f662 100644 --- a/librarian/mobi/style.css +++ b/librarian/mobi/style.css @@ -43,27 +43,10 @@ /* = Footnotes and themes = */ /* ======================== */ -.annotation-anchor -{ - font-style: normal; - font-weight: normal; - font-size: 0.875em; - display: block; - float: left; - width: 2.5em; - clear: both; -} - .annotation { - margin: 0; - margin-top: 1.5em; -} - -.annotation-body -{ - margin-left: 2.5em; - font-size: 0.875em; + margin-bottom: 0.3em; + text-align: left; } .block @@ -72,6 +55,7 @@ padding: 1em; } + /* ============= */ /* = Numbering = */ /* ============= */ -- 2.20.1