Merge from trunk

This commit is contained in:
Sengian 2010-10-11 00:36:26 +02:00
parent 9590ba6234
commit 19288b38ac
4 changed files with 154 additions and 126 deletions

View File

@ -1,4 +1,6 @@
body { background-color: white; }
body {
background-color: white;
}
p.title {
margin-top: 0em;

View File

@ -29,9 +29,9 @@
<div id="count_bar"><span id="left"><img
src="/static/first.png" alt="Show first set of books"
title="Show first set of books" />&nbsp;<img src="/static/previous.png"
alt="Show previous set of books" title="Show previous set of books" />&nbsp;</span><span
id="count">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>&nbsp;<span
title="Show first set of books" />&nbsp;<img
src="/static/previous.png" alt="Show previous set of books"
title="Show previous set of books" />&nbsp;</span><span id="count">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>&nbsp;<span
id="right"><img src="/static/next.png"
alt="Show next set of books" title="Show next set of books" />&nbsp;<img
src="/static/last.png" alt="Show last set of books"

View File

@ -1,24 +1,14 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:fb="http://www.gribuser.ru/xml/fictionbook/2.0">
<!--
#########################################################################
# #
# #
# copyright 2002 Paul Henry Tremblay #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
# General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA #
# 02111-1307 USA #
# #
# #
#########################################################################
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:fb="http://www.gribuser.ru/xml/fictionbook/2.0">
<!-- #########################################################################
# # # # # copyright 2002 Paul Henry Tremblay # # # # This program is distributed
in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without
even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU # # General Public License for more details. # # # #
You should have received a copy of the GNU General Public License # # along
with this program; if not, write to the Free Software # # Foundation, Inc.,
59 Temple Place, Suite 330, Boston, MA # # 02111-1307 USA # # # # # ######################################################################### -->
<xsl:output method="xml" encoding="UTF-8" />
<xsl:key name="note-link" match="fb:section" use="@id" />
<xsl:template match="/*">
@ -33,15 +23,32 @@
<style type="text/x-oeb1-css">
A { color : #0002CC }
A:HOVER { color : #BF0000 }
BODY { background-color : #FEFEFE; color : #000000; font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; text-align : justify }
H1{ font-size : 160%; font-style : normal; font-weight : bold; text-align : left; border : 1px solid Black; background-color : #E7E7E7; margin-left : 0px; page-break-before : always; }
H2{ font-size : 130%; font-style : normal; font-weight : bold; text-align : left; background-color : #EEEEEE; border : 1px solid Gray; page-break-before : always; }
H3{ font-size : 110%; font-style : normal; font-weight : bold; text-align : left; background-color : #F1F1F1; border : 1px solid Silver;}
H4{ font-size : 100%; font-style : normal; font-weight : bold; text-align : left; border : 1px solid Gray; background-color : #F4F4F4;}
H5{ font-size : 100%; font-style : italic; font-weight : bold; text-align : left; border : 1px solid Gray; background-color : #F4F4F4;}
H6{ font-size : 100%; font-style : italic; font-weight : normal; text-align : left; border : 1px solid Gray; background-color : #F4F4F4;}
SMALL{ font-size : 80% }
BLOCKQUOTE{ margin-left :4em; margin-top:1em; margin-right:0.2em;}
BODY { background-color : #FEFEFE; color : #000000; font-family :
Verdana, Geneva, Arial, Helvetica, sans-serif; text-align : justify
}
H1{ font-size : 160%; font-style : normal; font-weight : bold;
text-align : left; border : 1px solid Black; background-color :
#E7E7E7; margin-left : 0px; page-break-before : always; }
H2{
font-size : 130%; font-style : normal; font-weight : bold;
text-align : left; background-color : #EEEEEE; border : 1px solid
Gray; page-break-before : always; }
H3{ font-size : 110%; font-style
: normal; font-weight : bold; text-align : left; background-color :
#F1F1F1; border : 1px solid Silver;}
H4{ font-size : 100%;
font-style : normal; font-weight : bold; text-align : left; border
: 1px solid Gray; background-color : #F4F4F4;}
H5{ font-size : 100%;
font-style : italic; font-weight : bold; text-align : left; border
: 1px solid Gray; background-color : #F4F4F4;}
H6{ font-size : 100%;
font-style : italic; font-weight : normal; text-align : left;
border : 1px solid Gray; background-color : #F4F4F4;}
SMALL{
font-size : 80% }
BLOCKQUOTE{ margin-left :4em; margin-top:1em;
margin-right:0.2em;}
HR{ color : Black }
DIV{font-family : "Times New Roman", Times, serif; text-align : justify}
UL{margin-left: 0}

View File

@ -161,10 +161,29 @@ table[align="right"] {
float: right;
}
table[rules]:not ([rules="none"] ) {
border-collapse: collapse;
}
table
[
rules
]
:not
(
[
rules
=
"none"
]
)
{
border-collapse
:
collapse
;
}
/* caption inherits from table not table-outer */
caption {
display: table-caption;