2 files changed, 31 insertions, 24 deletions

diff --git a/docutils/docutils/writers/xhtml11/html-base.css b/docutils/docutils/writers/xhtml11/html-base.css
index 8dc320729..dcade02c8 100644
--- a/docutils/docutils/writers/xhtml11/html-base.css
+++ b/docutils/docutils/writers/xhtml11/html-base.css
@@ -51,17 +51,13 @@ div.document {
 
 /* Sections           */
 
-h1.title, h2.subtitle {
+h1.title, p.subtitle {
   text-align: center;
 }
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
-  margin-top: -0.25em;
-}
-span.section-subtitle {
-  /* font-size relative to parent (h1..h6 element) */
-  font-size: 75%;
-}
+
+h1 + p.subtitle { font-size: 1.5em; }
+h1 + p.section-subtitle { font-size: 1.5em; }
+h2 + p.section-subtitle { font-size: 1.17em; }
 
 a.toc-backref {
   color: black;
@@ -98,11 +94,18 @@ dl > dd {
 p.admonition-title,
 p.topic-title,
 p.sidebar-title,
-p.sidebar-subtitle,
 p.system-message-title {
   font-weight: bold;
 }
 
+p.subtitle,
+p.section-subtitle,
+p.sidebar-subtitle {
+  font-weight: bold;
+  margin-top: -0.5em;
+}
+
+
 /* Warnings, Errors */
 div.caution p.admonition-title,
 div.attention p.admonition-title,
@@ -189,6 +192,15 @@ dl.docinfo    > dt:after {
   content: ":";
 }
 
+/* example for custom field-name width */
+dl.field-list.narrow > dd {
+  margin-left: 5em;
+}
+/* run-in: start field-body on same line after long field names */
+dl.field-list.run-in > dd p {
+  display: block;
+}
+
 /* Bibliographic Fields */
 
 /* use special field-list dl.docinfo */
@@ -272,7 +284,6 @@ div.topic p.attribution {
 table {
   border-collapse: collapse;
 }
-
 td, th {
   border-style: solid;
   border-color: silver;
@@ -281,13 +292,15 @@ td, th {
 /* in Firefox 31.5.0 and opera 10.63 */
   border-width: thin;
 }
-
 td > p:first-child, th > p:first-child {
   margin-top: 0;
 }
 td > p, th > p {
   margin-bottom: 0;
 }
+th {
+  vertical-align: bottom;
+}
 
 table > caption {
   text-align: left;
@@ -473,8 +486,11 @@ ul.auto-toc {
 /*   cite		    */
 /* Inline Literals          */
 
-/* possible values: normal, nowrap, pre, pre-wrap, pre-line */
-tt.literal, span.literal { white-space: pre-wrap; }
+tt.literal, span.docutils.literal {
+  font-family: monospace;
+  /* possible values: normal, nowrap, pre, pre-wrap, pre-line */
+  white-space: pre-wrap;
+}
 /* do not wraph a hyphens and similar: */
 .literal > span.pre { white-space: nowrap; }
 
diff --git a/docutils/docutils/writers/xhtml11/xhtml11.css b/docutils/docutils/writers/xhtml11/xhtml11.css
index 4be88b6f4..35a7a45be 100644
--- a/docutils/docutils/writers/xhtml11/xhtml11.css
+++ b/docutils/docutils/writers/xhtml11/xhtml11.css
@@ -99,16 +99,6 @@ ol.nested > li:before, ol.nested  ol > li:before {
 
 /* field-list variants:: */
 
-/* example for custom field-name width */
-dl.field-list.narrow > dd {
-  margin-left: 5em;
-}
-
-/* start field-body on same line after long field names */
-dl.field-list.run-in > dd p {
-  display: block;
-}
-
 /* wrap or truncate long field names */
 dl.field-list.fix-labelwidth > dt {
   width: 8em; /* set to dl.field-list > dd margin-left - padding-left */
@@ -119,4 +109,5 @@ dl.field-list.fix-labelwidth > dd:after {
   content: '';
   display: block;
   clear: left;
+  vertical-align: baseline; 
 }