doc: restore original stylesheet for now

doc/Makefile

@@ -33,7 +33,7 @@ html: html-stamp
 html-stamp: stylesheet.xsl repmgr.sgml $(ALLSGML) $(GENERATED_SGML)
 	$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
 	$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $(wordlist 1,2,$^)
-	cp $(srcdir)/stylesheet.css html/
+	cp $(srcdir)/stylesheet.css  $(srcdir)/website-docs.css html/
 	touch $@
 
 # single-page HTML
@@ -41,6 +41,7 @@ repmgr.html: stylesheet-html-nochunk.xsl repmgr.sgml $(ALLSGML) $(GENERATED_SGML
 	$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
 	$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) -o $@ $(wordlist 1,2,$^)
 
+
 version.sgml: $(repmgr_top_builddir)/repmgr_version.h
 	{ \
 	  echo "<!ENTITY repmgrversion \"$(REPMGR_VERSION)\">"; \

doc/stylesheet.css

@@ -1,96 +1,471 @@
-/* doc/src/sgml/stylesheet.css */
+/* PostgreSQL.org Documentation Style */
 
-/* color scheme similar to www.postgresql.org */
+@import 'website-docs.css';
 
-BODY {
+/* requires global.css, table.css and text.css to be loaded before this file! */
-	color: #000000;
+body {
-	background: #FFFFFF;
+  font-family: verdana, sans-serif;
-	font-family: verdana, sans-serif;
+  font-size: 76%;
+  background: url("/resources/background.png") repeat-x scroll left top transparent;
+  padding: 15px 4%;
+  margin: 0;
 }
 
-A:link		{ color:#0066A2; }
+/* monospace font size fix */
-A:visited	{ color:#004E66; }
+pre, code, kbd, samp, tt {
-A:active	{ color:#0066A2; }
+  font-family: monospace,monospace;
-A:hover		{ color:#000000; }
+  font-size: 1em;
-
-H1 {
-	font-size: 1.4em;
-	font-weight: bold;
-	margin-top: 0em;
-	margin-bottom: 0em;
-	color: #EC5800;
 }
 
-H2 {
+div.NAVHEADER table {
-	font-size: 1.2em;
+  margin-left: 0;
-	margin: 1.2em 0em 1.2em 0em;
-	font-weight: bold;
-	color: #666;
 }
 
-H3 {
+/* Container Definitions */
-	font-size: 1.1em;
+
-	margin: 1.2em 0em 1.2em 0em;
+#docContainerWrap {
-	font-weight: bold;
+  text-align: center; /* Win IE5 */
-	color: #666;
 }
 
-H4 {
+#docContainer {
-	font-size: 0.95em;
+  margin: 0 auto;
-	margin: 1.2em 0em 1.2em 0em;
+  width: 90%;
-	font-weight: normal;
+  padding-bottom: 2em;
-	color: #666;
+  display: block;
+  text-align: left; /* Win IE5 */
 }
 
-H5 {
+#docHeader {
-	font-size: 0.9em;
+  background-image: url("/media/img/docs/bg_hdr.png");
-	margin: 1.2em 0em 1.2em 0em;
+  height: 83px;
-	font-weight: normal;
+  margin: 0px;
+  padding: 0px;
+  display: block;
 }
 
-H6 {
+#docHeaderLogo {
-	font-size: 0.85em;
+  position: relative;
-	margin: 1.2em 0em 1.2em 0em;
+  width: 206px;
-	font-weight: normal;
+  height: 83px;
+  border: 0px;
+  padding: 0px;
+  margin: 0 0 0 20px;
 }
 
-/* center some titles */
+#docHeaderLogo img {
-
+  border: 0px;
-.BOOK .TITLE, .BOOK .CORPAUTHOR, .BOOK .COPYRIGHT {
-	text-align: center;
 }
 
-/* decoration for formal examples */
+#docNavSearchContainer {
-
+  padding-bottom: 2px;
-DIV.EXAMPLE {
-	padding-left: 15px;
-	border-style: solid;
-	border-width: 0px;
-	border-left-width: 2px;
-	border-color: black;
-	margin: 0.5ex;
 }
 
-/* less dense spacing of TOC */
+#docNav, #docVersions {
-
+  position: relative;
-.BOOK .TOC DL DT {
+  text-align: left;
-	padding-top: 1.5ex;
+  margin-left: 10px;
-	padding-bottom: 1.5ex;
+  margin-top: 5px;
+  color: #666;
+  font-size: 0.95em;
 }
 
-.BOOK .TOC DL DL DT {
+#docSearch {
-	padding-top: 0ex;
+  position: relative;
-	padding-bottom: 0ex;
+  text-align: right;
+  padding: 0;
+  margin: 0;
+  color: #666;
 }
 
-/* miscellaneous */
+#docTextSize {
-
+  text-align: right;
-PRE.LITERALLAYOUT, .SCREEN, .SYNOPSIS, .PROGRAMLISTING {
+  white-space: nowrap;
-	margin-left: 4ex;
+  margin-top: 7px;
+  font-size: 0.95em;
 }
 
-.COMMENT	{ color: red; }
+#docSearch form {
+  position: relative;
+  top: 5px;
+  right: 0;
+  margin: 0; /* need for IE 5.5 OSX */
+  text-align: right; /* need for IE 5.5 OSX */
+  white-space: nowrap; /* for Opera */
+}
 
-VAR		{ font-family: monospace; font-style: italic; }
+#docSearch form label {
-/* Konqueror's standard style for ACRONYM is italic. */
+  color: #666;
-ACRONYM		{ font-style: inherit; }
+  font-size: 0.95em;
+}
+
+#docSearch form input {
+  font-size: 0.95em;
+}
+  
+#docSearch form #submit {
+  font-size: 0.95em;
+  background: #7A7A7A;
+  color: #fff;
+  border: 1px solid #7A7A7A;
+  padding: 1px 4px;
+}
+  
+#docSearch form #q {
+  width: 170px;
+  font-size: 0.95em;
+  border:  1px solid #7A7A7A;
+  background: #E1E1E1;
+  color: #000000;
+  padding: 2px;
+}
+
+.frmDocSearch {
+  padding: 0;
+  margin: 0;
+  display: inline;
+}
+
+.inpDocSearch {
+  padding: 0;
+  margin: 0;
+  color: #000;
+}
+
+#docContent {
+  position: relative;
+  margin-left: 10px;
+  margin-right: 10px;
+  margin-top: 40px;
+}
+
+#docFooter {
+  position: relative;
+  font-size: 0.9em; 
+  color: #666; 
+  line-height: 1.3em; 
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+#docComments {
+  margin-top: 10px;
+}
+
+#docClear {
+  clear: both;
+  margin: 0;
+  padding: 0;
+}
+
+/* Heading Definitions */
+
+h1, h2, h3 {
+  font-weight: bold;
+  margin-top: 2ex;
+  color: #444;
+}
+
+h1 {
+  font-size: 1.4em;
+}
+
+h2 {
+  font-size: 1.2em !important;
+}
+
+h3 {
+  font-size: 1.1em;
+}
+
+h1 a:hover,
+h2 a:hover,
+h3 a:hover,
+h4 a:hover {
+  color: #444;
+  text-decoration: none;
+}
+
+/* Text Styles */
+
+div.SECT2 {
+  margin-top: 4ex;
+}
+
+div.SECT3 {
+  margin-top: 3ex;
+  margin-left: 3ex;
+}
+
+.txtCurrentLocation {
+  font-weight: bold;
+}
+
+p, ol, ul, li {
+  line-height: 1.5em;
+}
+
+.txtCommentsWrap {
+  border: 2px solid #F5F5F5; 
+  width: 100%;
+}
+
+.txtCommentsContent {
+  background: #F5F5F5;
+  padding: 3px;
+}
+
+.txtCommentsPoster {
+  float: left;
+}
+
+.txtCommentsDate {
+  float: right;
+}
+
+.txtCommentsComment {
+  padding: 3px;
+}
+
+#docContainer pre code,
+#docContainer pre tt,
+#docContainer pre pre,
+#docContainer tt tt,
+#docContainer tt code,
+#docContainer tt pre {
+  font-size: 1em;
+}
+
+pre.LITERALLAYOUT,
+.SCREEN,
+.SYNOPSIS,
+.PROGRAMLISTING,
+.REFSYNOPSISDIV p,
+table.CAUTION,
+table.WARNING,
+blockquote.NOTE,
+blockquote.TIP,
+table.CALSTABLE {
+  -moz-box-shadow: 3px 3px 5px #DFDFDF;
+  -webkit-box-shadow: 3px 3px 5px #DFDFDF;
+  -khtml-box-shadow: 3px 3px 5px #DFDFDF;
+  -o-box-shadow: 3px 3px 5px #DFDFDF;
+  box-shadow: 3px 3px 5px #DFDFDF;
+}
+
+pre.LITERALLAYOUT,
+.SCREEN,
+.SYNOPSIS,
+.PROGRAMLISTING,
+.REFSYNOPSISDIV p,
+table.CAUTION,
+table.WARNING,
+blockquote.NOTE,
+blockquote.TIP {
+  color: black;
+  border-width: 1px;
+  border-style: solid;
+  padding: 2ex;
+  margin: 2ex 0 2ex 2ex;
+  overflow: auto;
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+  -khtml-border-radius: 8px;
+  border-radius: 8px;
+}
+
+pre.LITERALLAYOUT,
+pre.SYNOPSIS,
+pre.PROGRAMLISTING,
+.REFSYNOPSISDIV p,
+.SCREEN {
+  border-color: #CFCFCF;
+  background-color: #F7F7F7;
+}
+
+blockquote.NOTE,
+blockquote.TIP {
+  border-color: #DBDBCC;
+  background-color: #EEEEDD;
+  padding: 14px;
+  width: 572px;
+}
+
+blockquote.NOTE,
+blockquote.TIP,
+table.CAUTION,
+table.WARNING {
+  margin: 4ex auto;
+}
+
+blockquote.NOTE p,
+blockquote.TIP p {
+  margin: 0;
+}
+
+blockquote.NOTE pre,
+blockquote.NOTE code,
+blockquote.TIP pre,
+blockquote.TIP code {
+  margin-left: 0;
+  margin-right: 0;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  -khtml-box-shadow: none;
+  -o-box-shadow: none;
+  box-shadow: none;
+}
+
+.emphasis,
+.c2 {
+  font-weight: bold;
+}
+
+.REPLACEABLE {
+  font-style: italic;
+}
+
+/* Table Styles */
+
+table {
+  margin-left: 2ex;
+}
+
+table.CALSTABLE td,
+table.CALSTABLE th,
+table.CAUTION td,
+table.CAUTION th,
+table.WARNING td,
+table.WARNING th {
+  border-style: solid;
+}
+
+table.CALSTABLE,
+table.CAUTION,
+table.WARNING {
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+
+table.CALSTABLE
+{
+  margin: 2ex 0 2ex 2ex;
+  background-color: #E0ECEF;
+  border: 2px solid #A7C6DF;
+}
+
+table.CALSTABLE tr:hover td
+{
+  background-color: #EFEFEF;
+}
+
+table.CALSTABLE td {
+  background-color: #FFF;
+}
+
+table.CALSTABLE td,
+table.CALSTABLE th {
+  border: 1px solid #A7C6DF;
+  padding: 0.5ex 0.5ex;
+}
+
+table.CAUTION,
+table.WARNING {
+  border-collapse: separate;
+  display: block;
+  padding: 0;
+  max-width: 600px;
+}
+
+table.CAUTION {
+  background-color: #F5F5DC;
+  border-color: #DEDFA7;
+}
+
+table.WARNING {
+  background-color: #FFD7D7;
+  border-color: #DF421E;
+}
+
+table.CAUTION td,
+table.CAUTION th,
+table.WARNING td,
+table.WARNING th {
+  border-width: 0;
+  padding-left: 2ex;
+  padding-right: 2ex;
+}
+
+table.CAUTION td,
+table.CAUTION th {
+  border-color: #F3E4D5
+}
+
+table.WARNING td,
+table.WARNING th {
+  border-color: #FFD7D7;
+}
+
+td.c1,
+td.c2,
+td.c3,
+td.c4,
+td.c5,
+td.c6 {
+  font-size: 1.1em;
+  font-weight: bold;
+  border-bottom: 0px solid #FFEFEF;
+  padding: 1ex 2ex 0;
+}
+
+/* Link Styles */
+
+#docNav a {
+  font-weight: bold;
+}
+
+a:link,
+a:visited,
+a:active,
+a:hover {
+  text-decoration: underline;
+}
+
+a:link,
+a:active {
+  color:#0066A2;
+}
+
+a:visited {
+  color:#004E66;
+}
+
+a:hover {
+  color:#000000;
+}
+
+#docFooter a:link,
+#docFooter a:visited,
+#docFooter a:active {
+  color:#666;
+}
+
+#docContainer code.FUNCTION tt {
+  font-size: 1em;
+}
+
+div.header {
+    color: #444;
+    margin-top: 5px;
+}
+
+div.footer {
+    text-align: center;
+    background-image: url("/resources/footerl.png"), url("/resources/footerr.png"), url("/resources/footerc.png");
+    background-position: left top, right top, center top;
+    background-repeat: no-repeat, no-repeat, repeat-x;
+    padding-top: 45px;
+}
+
+img {
+    border-style: none;
+}

doc/website-docs.css

@@ -1,21 +1,20 @@
 /* PostgreSQL.org Documentation Style */
 
+/*
+ * Documentation generated by XSL stylesheets has lower-case class
+ * names, older documentation generated by DSSSL stylesheets has
+ * upper-case class names, so we need to support both for a while.  In
+ * some cases, the elements and classes differ further between the two
+ * stylesheets.
+ */
+
 /* requires global.css, table.css and text.css to be loaded before this file! */
 body {
-  font-family: verdana, sans-serif;
   font-size: 76%;
-  background: url("/resources/background.png") repeat-x scroll left top transparent;
-  padding: 15px 4%;
-  margin: 0;
 }
 
-/* monospace font size fix */
+.navheader table,
-pre, code, kbd, samp, tt {
+.NAVHEADER table {
-  font-family: monospace,monospace;
-  font-size: 1em;
-}
-
-div.NAVHEADER table {
   margin-left: 0;
 }
 
@@ -160,7 +159,6 @@ div.NAVHEADER table {
 h1, h2, h3 {
   font-weight: bold;
   margin-top: 2ex;
-  color: #444;
 }
 
 h1 {
@@ -175,20 +173,35 @@ h3 {
   font-size: 1.1em;
 }
 
-h1 a:hover,
+h1 a:hover {
+  color: #EC5800;
+  text-decoration: none;
+}
+
 h2 a:hover,
 h3 a:hover,
 h4 a:hover {
-  color: #444;
+  color: #666666;
   text-decoration: none;
 }
 
+/*
+ * Change color of h2 chunk titles in XSL build.  (In DSSSL build,
+ * these will be h1, which is already handled elsewhere.)
+ */
+.titlepage h2.title,
+.refnamediv h2 {
+  color: #EC5800;
+}
+
 /* Text Styles */
 
+div.sect2,
 div.SECT2 {
   margin-top: 4ex;
 }
 
+div.sect3,
 div.SECT3 {
   margin-top: 3ex;
   margin-left: 3ex;
@@ -233,6 +246,17 @@ p, ol, ul, li {
   font-size: 1em;
 }
 
+pre.literallayout,
+.screen,
+.synopsis,
+.programlisting,
+.refsynopsisdiv p,
+.caution,
+.warning,
+.note,
+.tip,
+.table table,
+.informaltable table,
 pre.LITERALLAYOUT,
 .SCREEN,
 .SYNOPSIS,
@@ -250,6 +274,15 @@ table.CALSTABLE {
   box-shadow: 3px 3px 5px #DFDFDF;
 }
 
+pre.literallayout,
+.screen,
+.synopsis,
+.programlisting,
+.refsynopsisdiv p,
+.caution,
+.warning,
+.note,
+.tip,
 pre.LITERALLAYOUT,
 .SCREEN,
 .SYNOPSIS,
@@ -271,6 +304,11 @@ blockquote.TIP {
   border-radius: 8px;
 }
 
+pre.literallayout,
+pre.synopsis,
+pre.programlisting,
+.refsynopsisdiv p,
+.screen,
 pre.LITERALLAYOUT,
 pre.SYNOPSIS,
 pre.PROGRAMLISTING,
@@ -280,6 +318,8 @@ pre.PROGRAMLISTING,
   background-color: #F7F7F7;
 }
 
+.note,
+.tip,
 blockquote.NOTE,
 blockquote.TIP {
   border-color: #DBDBCC;
@@ -288,6 +328,10 @@ blockquote.TIP {
   width: 572px;
 }
 
+.note,
+.tip,
+.caution,
+.warning,
 blockquote.NOTE,
 blockquote.TIP,
 table.CAUTION,
@@ -295,11 +339,17 @@ table.WARNING {
   margin: 4ex auto;
 }
 
+.note p,
+.tip p,
 blockquote.NOTE p,
 blockquote.TIP p {
   margin: 0;
 }
 
+.note pre,
+.note code,
+.tip pre,
+.tip code,
 blockquote.NOTE pre,
 blockquote.NOTE code,
 blockquote.TIP pre,
@@ -313,11 +363,24 @@ blockquote.TIP code {
   box-shadow: none;
 }
 
+.caution,
+.warning {
+  max-width: 600px;
+}
+
+.tip h3,
+.note h3,
+.caution h3,
+.warning h3 {
+  text-align: center;
+}
+
 .emphasis,
 .c2 {
   font-weight: bold;
 }
 
+.replaceable,
 .REPLACEABLE {
   font-style: italic;
 }
@@ -328,6 +391,10 @@ table {
   margin-left: 2ex;
 }
 
+.table table td,
+.table table th,
+.informaltable table td,
+.informaltable table th,
 table.CALSTABLE td,
 table.CALSTABLE th,
 table.CAUTION td,
@@ -337,6 +404,8 @@ table.WARNING th {
   border-style: solid;
 }
 
+.table table,
+.informaltable table,
 table.CALSTABLE,
 table.CAUTION,
 table.WARNING {
@@ -344,6 +413,8 @@ table.WARNING {
   border-collapse: collapse;
 }
 
+.table table,
+.informaltable table,
 table.CALSTABLE
 {
   margin: 2ex 0 2ex 2ex;
@@ -351,15 +422,23 @@ table.CALSTABLE
   border: 2px solid #A7C6DF;
 }
 
+.table table tr:hover td,
+.informaltable table tr:hover td,
 table.CALSTABLE tr:hover td
 {
   background-color: #EFEFEF;
 }
 
+.table table td,
+.informaltable table td,
 table.CALSTABLE td {
   background-color: #FFF;
 }
 
+.table table td,
+.table table th,
+.informaltable table td,
+.informaltable table th,
 table.CALSTABLE td,
 table.CALSTABLE th {
   border: 1px solid #A7C6DF;
@@ -374,11 +453,13 @@ table.WARNING {
   max-width: 600px;
 }
 
+.caution,
 table.CAUTION {
   background-color: #F5F5DC;
   border-color: #DEDFA7;
 }
 
+.warning,
 table.WARNING {
   background-color: #FFD7D7;
   border-color: #DF421E;
@@ -447,23 +528,7 @@ a:hover {
   color:#666;
 }
 
+#docContainer code.function tt,
 #docContainer code.FUNCTION tt {
   font-size: 1em;
 }
-
-div.header {
-    color: #444;
-    margin-top: 5px;
-}
-
-div.footer {
-    text-align: center;
-    background-image: url("/resources/footerl.png"), url("/resources/footerr.png"), url("/resources/footerc.png");
-    background-position: left top, right top, center top;
-    background-repeat: no-repeat, no-repeat, repeat-x;
-    padding-top: 45px;
-}
-
-img {
-    border-style: none;
-}