Mods to docbook styling, based on main Spring docs

src/docbkx/resources/css/html.css

@@ -1,46 +1,17 @@
 body {
-    text-align: justify;
-    margin-right: 2em;
-    margin-left: 2em;
+   text-align: justify;
+   margin-right: 2em;
+   margin-left: 2em;
 }
 
 a,
-    a[accesskey^
-
-=
-"h"
-]
-,
-a[accesskey^
-
-=
-"n"
-]
-,
-a[accesskey^
-
-=
-"u"
-]
-,
-a[accesskey^
-
-=
-"p"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
-font-size:
-
-12
-px
-
-;
-color: #003399
-
-;
+a[accesskey^="h"],
+a[accesskey^="n"],
+a[accesskey^="u"],
+a[accesskey^="p"] {
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    font-size: 12px;
+	color: #003399;
 }
 
 a:active {
@@ -52,19 +23,19 @@ a:visited {
 }
 
 p {
-    font-family: Verdana, Arial, sans-serif;
+	font-family: Verdana, Arial, sans-serif;
 }
 
 dt {
-    font-family: Verdana, Arial, sans-serif;
-    font-size: 12px;
+	font-family: Verdana, Arial, sans-serif;
+	font-size: 12px;
 }
 
 p, dl, dt, dd, blockquote {
     color: #000000;
     margin-bottom: 3px;
     margin-top: 3px;
-    padding-top: 0px;
+    padding-top: 0;
 }
 
 ol, ul, p {
@@ -85,7 +56,7 @@ p.releaseinfo {
 
 p.pubdate {
     font-size: 120%;
-    font-weight: bold;
+    font-weight: bold; 
     font-family: Verdana, Arial, helvetica, sans-serif;
 }
 
@@ -97,53 +68,27 @@ td, th, span {
     color: #000000;
 }
 
-td[width^
-
-=
-"40%"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
-font-size:
-
-12
-px
-
-;
-color: #003399
-
-;
+td[width^="40%"] {
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    font-size: 12px;
+	color: #003399;
 }
 
-table[summary^
-
-=
-"Navigation header"
-]
-tbody tr th[colspan^
-
-=
-"3"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
+table[summary^="Navigation header"] tbody tr th[colspan^="3"] {
+    font-family: Verdana, Arial, helvetica, sans-serif;
 }
 
 blockquote {
-    margin-right: 0px;
+    margin-right: 0;
 }
 
-h1, h2, h3, h4, h6, H6 {
+h1, h2, h3, h4, h6 {
     color: #000000;
     font-weight: 500;
-    margin-top: 0px;
+    margin-top: 0;
     padding-top: 14px;
     font-family: Verdana, Arial, helvetica, sans-serif;
-    margin-bottom: 0px;
+    margin-bottom: 0;
 }
 
 h2.title {
@@ -157,7 +102,7 @@ h2.subtitle {
 }
 
 .firstname, .surname {
-    font-size: 12px;
+	font-size: 12px;
     font-family: Verdana, Arial, helvetica, sans-serif;
 }
 
@@ -166,114 +111,42 @@ table {
     border-spacing: 0;
     border: 1px black;
     empty-cells: hide;
-    margin: 10px 0px 30px 50px;
+    margin: 10px 0 30px 50px;
     width: 90%;
 }
 
 div.table {
-    margin: 30px 0px 30px 0px;
-    border: 1px dashed gray;
-    padding: 10px;
+	margin: 30px 0 10px 0;
+	border: 1px dashed gray;
+	padding: 10px;
 }
 
 div .table-contents table {
-    border: 1px solid black;
+	border: 1px solid black;
 }
 
 div.table > p.title {
-    padding-left: 10px;
+	padding-left: 10px;
 }
 
-table[summary^
-
-=
-"Navigation footer"
-]
-{
-border-collapse: collapse
-
-;
-border-spacing:
-
-0
-;
-border:
-
-1
-px black
-
-;
-empty-cells: hide
-
-;
-margin:
-
-0
-px
-
-;
-width:
-
-100
-%
-;
+table[summary^="Navigation footer"] {
+    border-collapse: collapse;
+    border-spacing: 0;
+    border: 1px black;
+    empty-cells: hide;    
+    margin: 0px;
+    width: 100%;
 }
 
-table[summary^
-
-=
-"Note"
-]
-,
-table[summary^
-
-=
-"Warning"
-]
-,
-table[summary^
-
-=
-"Tip"
-]
-{
-border-collapse: collapse
-
-;
-border-spacing:
-
-0
-;
-border:
-
-1
-px black
-
-;
-empty-cells: hide
-
-;
-margin:
-
-10
-px
-
-0
-px
-
-10
-px
-
--
-20
-px
-
-;
-width:
-
-100
-%
-;
+table[summary^="Note"],
+table[summary^="Warning"],
+table[summary^="Tip"] {
+    border-collapse: collapse;
+    border-spacing: 0;
+    border: 1px black;
+    empty-cells: hide;    
+    margin: 10px 0px 10px -20px;
+    width: 100%;
 }
 
 td {
@@ -282,35 +155,31 @@ td {
 }
 
 div.warning TD {
-    text-align: justify;
+	text-align: justify;
 }
 
-h1 {
-    font-size: 150%;
+h1 { 
+    font-size: 150%; 
 }
 
-h2 {
-    font-size: 110%;
+h2 { 
+    font-size: 110%; 
 }
 
 h3 {
-    font-size: 100%;
-    font-weight: bold;
+    font-size: 100%; font-weight: bold; 
 }
 
-h4 {
-    font-size: 90%;
-    font-weight: bold;
+h4 { 
+    font-size: 90%; font-weight: bold;
 }
 
 h5 {
-    font-size: 90%;
-    font-style: italic;
+    font-size: 90%; font-style: italic; 
 }
 
-h6 {
-    font-size: 100%;
-    font-style: italic;
+h6 { 
+    font-size: 100%; font-style: italic; 
 }
 
 tt {
@@ -320,13 +189,14 @@ tt {
 }
 
 .navheader, .navfooter {
-    border: none;
+	border: none;
 }
 
 div.navfooter table {
-    border: dashed gray;
-    border-width: 1px 1px 1px 1px;
-    background-color: #cde48d;
+	border-style: dashed;
+	border-color: gray;
+	border-width: 1px 1px 1px 1px;
+	background-color: #cde48d;
 }
 
 pre {
@@ -346,23 +216,23 @@ hr {
     width: 100%;
     height: 1px;
     background-color: #CCCCCC;
-    border-width: 0px;
-    padding: 0px;
+    border-width: 0;
+    padding: 0;
 }
 
-.variablelist {
-    padding-top: 10px;
-    padding-bottom: 10px;
+.variablelist { 
+    padding-top: 10px; 
+    padding-bottom: 10px; 
     margin: 0;
 }
 
-.term {
-    font-weight: bold;
+.term { 
+    font-weight:bold;
 }
 
 .mediaobject {
-    padding-top: 30px;
-    padding-bottom: 30px;
+    padding-top: 30px; 
+    padding-bottom: 30px; 
 }
 
 .legalnotice {
@@ -373,7 +243,7 @@ hr {
 
 .sidebar {
     float: right;
-    margin: 10px 0px 10px 30px;
+    margin: 10px 0 10px 30px;
     padding: 10px 20px 20px 20px;
     width: 33%;
     border: 1px solid black;
@@ -382,12 +252,12 @@ hr {
 }
 
 .property {
-    font-family: "Courier New", Courier, monospace;
+	font-family: "Courier New", Courier, monospace;
 }
 
 a code {
-    font-family: Verdana, Arial, monospace;
-    font-size: 12px;
+	font-family: Verdana, Arial, monospace;
+	font-size: 12px;
 }
 
 td code {
@@ -395,27 +265,35 @@ td code {
 }
 
 div.note * td,
-    div.tip * td,
-    div.warning * td,
-    div.calloutlist * td {
-    text-align: justify;
-    font-size: 100%;
+div.tip * td,
+div.warning * td,
+div.calloutlist * td {
+	text-align: justify;
+	font-size: 100%;
 }
 
 .programlisting .interfacename,
-    .programlisting .literal,
-    .programlisting .classname {
+.programlisting .literal,
+.programlisting .classname {
     font-size: 95%;
 }
 
 .title .interfacename,
-    .title .literal,
-    .title .classname {
+.title .literal,
+.title .classname {
     font-size: 130%;
 }
 
 /* everything in a <lineannotation/> is displayed in a coloured, comment-like font */
 .programlisting * .lineannotation,
-    .programlisting * .lineannotation * {
-    color: green;
+.programlisting * .lineannotation * {
+	color: green;
+}
+
+.question * p {
+    font-size: 100%;
+}
+
+.answer * p {
+    font-size: 100%;
 }

src/docbkx/resources/xsl/html_chunk.xsl

@@ -78,7 +78,7 @@
                 <img style="border:none;" src="images/xdev-spring_logo.jpg"/>
             </a>
             <a style="border:none;" href="http://www.springsource.com/" title="SpringSource">
-                <img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/s2_box_logo.png"/>
+                <img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/s2-banner-rhs.png"/>
             </a>
         </div>
     </xsl:template>