From: Radek Czajka Date: Wed, 12 Jan 2011 12:22:47 +0000 (+0100) Subject: #1030: fixes for separators and empty verses in html, epub, pdf X-Git-Tag: 1.7~223 X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/cbc4c58f8d8cc36b4608da2303047bfbf7fb6cdd #1030: fixes for separators and empty verses in html, epub, pdf --- diff --git a/librarian/epub/xsltScheme.xsl b/librarian/epub/xsltScheme.xsl index ff0ceb5..bb96350 100644 --- a/librarian/epub/xsltScheme.xsl +++ b/librarian/epub/xsltScheme.xsl @@ -173,19 +173,19 @@
-
+  
-
+  
-
+  
@@ -194,13 +194,13 @@ margin-left: em; - +  
-
+  
@@ -266,7 +266,7 @@ -
+

 

diff --git a/librarian/pdf/wl.sty b/librarian/pdf/wl.sty index 687efde..a7a97ba 100644 --- a/librarian/pdf/wl.sty +++ b/librarian/pdf/wl.sty @@ -326,15 +326,20 @@ Letters={Uppercase} } \newcommand{\sekcjaswiatlo}{% -\hspace{30pt}% +\vspace{30pt}% } \newcommand{\sekcjaasterysk}{% +\vspace{10pt}% +\begin{center}% \par{*}% +\end{center}% } \newcommand{\separatorlinia}{% +\vspace{10pt}% \hrule{}% +\vspace{10pt}% } \newcommand{\motyw}[2][0]{% diff --git a/librarian/xslt/book2html.xslt b/librarian/xslt/book2html.xslt index 3c52b0b..752eade 100755 --- a/librarian/xslt/book2html.xslt +++ b/librarian/xslt/book2html.xslt @@ -54,6 +54,7 @@ background: #333; color: #FFF; opacity: 0.9; + z-index: 99; } #menu ul { @@ -74,15 +75,30 @@ #menu li a:hover, #menu li a:active { color: #000; - background: #FFF url(/media/img/arrow-down.png) no-repeat center right; + background: #FFF url(/static/img/arrow-down.png) no-repeat center right; } #menu li a.selected { color: #000; - background: #FFF url(/media/img/arrow-up.png) no-repeat center right; + background: #FFF url(/static/img/arrow-up.png) no-repeat center right; } + #menu a.menu-link { + display: block; + float: left; + height: 1.5em; + margin-left: 0.5em; + text-align: center; + color: #FFF; + } + #menu span { + color: #888; + font-style: italic; + font-size: .75em; + margin-right: 0.5em; + } + - #toc, #themes { + #toc, #themes, #nota_red { position: fixed; left: 0em; top: 1.5em; @@ -96,6 +112,7 @@ overflow-x: hidden; overflow-y: auto; opacity: 0.9; + z-index: 99; } #toc ol, #themes ol { @@ -172,11 +189,18 @@ color: #777; padding: 0 0.5em; width: 7.5em; + font-style: normal; font-weight: normal; + font-variant: normal; + letter-spacing: 0; + text-transform: none; + text-decoration: none; + font-size: 16px; float: right; margin-right: -9.5em; + margin-bottom: 0.5em; clear: both; left: 40em; line-height: 1.5em; @@ -187,6 +211,9 @@ font-style: normal; font-weight: normal; font-size: 12px; + padding-left: 2px; + position: relative; + top: -4px; } #footnotes .annotation { @@ -212,10 +239,13 @@ /* ============= */ /* = Numbering = */ /* ============= */ + .verse, .paragraph { + position:relative; + } .anchor { position: absolute; margin: -0.25em -0.5em; - left: 1em; + left: -3em; color: #777; font-size: 12px; width: 2em; @@ -334,6 +364,19 @@ font-style: normal; font-variant: small-caps; } + + .verse:after { + content: "\feff"; + } + + + /* =================================== */ + /* = Hide some elements for printing = */ + /* =================================== */ + + @media print { + #menu {display: none;} + } -->