[postgis-tickets] r16964 - Update HTML document styling to new "standard"
Paul Ramsey
pramsey at cleverelephant.ca
Tue Oct 30 12:47:52 PDT 2018
Author: pramsey
Date: 2018-10-30 12:47:52 -0700 (Tue, 30 Oct 2018)
New Revision: 16964
Added:
branches/2.5/doc/html/ga.js
Modified:
branches/2.5/doc/Makefile.in
branches/2.5/doc/html/
branches/2.5/doc/html/style.css
Log:
Update HTML document styling to new "standard"
Modified: branches/2.5/doc/Makefile.in
===================================================================
--- branches/2.5/doc/Makefile.in 2018-10-30 18:40:53 UTC (rev 16963)
+++ branches/2.5/doc/Makefile.in 2018-10-30 19:47:52 UTC (rev 16964)
@@ -58,13 +58,19 @@
--param funcsynopsis.style kr \
--param admon.graphics 1 \
--param admon.textlabel 0 \
+ --param make.clean.html 1 \
--param simplesect.in.toc 0 \
--param use.id.as.filename 1 \
--param chunk.quietly 1 \
+ --param header.rule 0 \
+ --param footer.rule 0 \
+ --param table.borders.with.css 1 \
+ --stringparam chunker.output.encoding UTF-8 \
+ --stringparam chunker.output.indent no \
+ --stringparam saxon.character.representation decimal \
+ --stringparam html.stylesheet style.css \
$(XSLTPROCFLAGS)
-XSLTPROC_HTMLOPTS= \
- --stringparam html.stylesheet style.css \
HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl
CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl
@@ -137,7 +143,7 @@
reporting.xml \
using_postgis_app.xml \
using_postgis_dataman.xml \
- using_raster_dataman.xml
+ using_raster_dataman.xml
XML_GENERATED_SOURCES = \
postgis_aggs_mm.xml \
@@ -208,31 +214,31 @@
postgis_comments.sql: ./xsl/postgis_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/postgis_comments.sql.xsl postgis-out.xml > $@
-
+
postgis_cheatsheet.html: ./xsl/postgis_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/postgis_cheatsheet.html.xsl postgis-out.xml > $@
-
+
raster_comments.sql: ./xsl/raster_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/raster_comments.sql.xsl postgis-out.xml > $@
-
+
raster_cheatsheet.html: ./xsl/raster_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/raster_cheatsheet.html.xsl postgis-out.xml > $@
-
+
topology_comments.sql: ./xsl/topology_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/topology_comments.sql.xsl postgis-out.xml > $@
-
+
topology_cheatsheet.html: ./xsl/topology_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/topology_cheatsheet.html.xsl postgis-out.xml > $@
-
+
sfcgal_comments.sql: ./xsl/sfcgal_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/sfcgal_comments.sql.xsl postgis-out.xml > $@
-
+
sfcgal_cheatsheet.html: ./xsl/sfcgal_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/sfcgal_cheatsheet.html.xsl postgis-out.xml > $@
-
+
tiger_geocoder_comments.sql: ./xsl/tiger_geocoder_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_comments.sql.xsl postgis-out.xml > $@
-
+
tiger_geocoder_cheatsheet.html: ./xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
@@ -240,12 +246,19 @@
$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@
chunked-html: postgis-out.xml Makefile images $(XML_INPUTS)
- $(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
+ $(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
--output html/ \
- --stringparam saxon.character.representation decimal \
$(CHUNK_HTML_DOCBOOK_XSL) \
$<
+chunked-html-web: postgis-out.xml Makefile images $(XML_INPUTS)
+ $(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
+ --output html/ \
+ --stringparam html.script ga.js \
+ $(CHUNK_HTML_DOCBOOK_XSL) \
+ $<
+
+
html: html/postgis$(DOCSUFFIX).html
html-localized:
@@ -255,7 +268,7 @@
done
html/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile images $(XML_INPUTS)
- $(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
+ $(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
--output html/postgis$(DOCSUFFIX).html \
$(HTML_DOCBOOK_XSL) \
$<
@@ -279,7 +292,7 @@
-s "${PWD}/texstyle.sty" \
-o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf $<; \
fi
-
+
postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images $(XML_INPUTS)
if test x"$(DBTOEPUB)" = x; then \
echo "Error: dbtoepub not found, can't build epub"; \
@@ -307,13 +320,13 @@
doxygen: doxygen.cfg
doxygen $<
-images:
+images:
$(MAKE) -C html/image_src images
images-clean:
$(MAKE) -C html/image_src images-clean
-
-clean:
+
+clean:
rm -f html/*.html
rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
rm -f *.epub
@@ -338,7 +351,7 @@
cheatsheets: postgis_cheatsheet.html raster_cheatsheet.html topology_cheatsheet.html sfcgal_cheatsheet.html tiger_geocoder_cheatsheet.html
ifneq ($(CAN_BUILD_COMMENTS),yes)
-comments-install:
+comments-install:
if test -e postgis_comments.sql -a \
-e raster_comments.sql -a \
-e topology_comments.sql -a \
@@ -370,7 +383,7 @@
$(INSTALL_DATA) html/images/* $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images/
$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
-docs-uninstall:
+docs-uninstall:
rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/style.css
rm -rf $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images
@@ -436,11 +449,11 @@
@echo
requirements_not_met_imagemagick:
- @echo
+ @echo
@echo "configure was unable to find the ImageMagick's 'convert' utility program."
@echo "To build the documentation, install ImageMagick and then re-run configure. Alternatively "
@echo "refer to online manual:"
@echo
@echo " http://postgis.net/documentation"
- @echo
-
+ @echo
+
Index: branches/2.5/doc/html
===================================================================
--- branches/2.5/doc/html 2018-10-30 18:40:53 UTC (rev 16963)
+++ branches/2.5/doc/html 2018-10-30 19:47:52 UTC (rev 16964)
Property changes on: branches/2.5/doc/html
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
-*.html
\ No newline at end of property
+*.html
+docbook.css
Added: branches/2.5/doc/html/ga.js
===================================================================
--- branches/2.5/doc/html/ga.js (rev 0)
+++ branches/2.5/doc/html/ga.js 2018-10-30 19:47:52 UTC (rev 16964)
@@ -0,0 +1,7 @@
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-37775762-1', 'auto');
+ga('send', 'pageview');
Modified: branches/2.5/doc/html/style.css
===================================================================
--- branches/2.5/doc/html/style.css 2018-10-30 18:40:53 UTC (rev 16963)
+++ branches/2.5/doc/html/style.css 2018-10-30 19:47:52 UTC (rev 16964)
@@ -1,51 +1,263 @@
-/* PostGIS Alternative Docbook CSS | Dane Springmeyer
------------------------------------------------------ */
+/*
+* PostGIS Alternative Docbook CSS
+* Dane Springmeyer
+* Paul Ramsey
+*/
-/* 1. Body
------------------------------------------------------ */
+/* 1. Body ----------------------------------------------------- */
+body {
+ font: 100% 'Lucida Grande', Verdana, Geneva, Arial, Helvetica, sans-serif;
+ background: #ffffff;
+ color: #2e2e2e;
+ margin: 0;
+ padding: 0em 6em 0em 6em;
+}
+div.navheader {
+ margin: 0em -6em 0em -6em;
+ padding: 2em 6em 2em 6em;
+ background: #579;
+}
-body { font: 90% 'Lucida Grande', Verdana, Geneva, Arial, Helvetica, sans-serif; background: #ffffff; color: #2e2e2e; margin: 2em; padding: 2em; }
+div.navfooter {
+ margin: 0em -6em 0em -6em;
+ padding: 2em 6em 2em 6em;
+ background: #579;
+ color: white;
+}
+div.navfooter table {
+ color: white;
+}
-/* 2. Standard Tags
------------------------------------------------------ */
+div.navheader table tbody tr:first-child th {
+ color: white;
+ font-size: 140%;
+ font-style: normal;
+}
-a {text-decoration: none; color: #418acd; }
-a:hover, li a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover {color: #e9cb2b; }
-p,form,td,th,dt,li{font-size:10pt}
-h1, h2 {color: #282e5b;}
-h3,h4,th,dt,b {color: #213780;}
-h1 { font-size: 24px; line-height: 24px; margin-bottom: 24px;}
-h2 { font-size: 22px; line-height: 22px; margin-bottom: 21px;}
-h3 { font-size: 16px; line-height: 18px; margin-bottom: 16px;}
-h4 { font-size: 14px; line-height: 16px; margin-bottom: 14px;}
-h5 { font-size: 13px; line-height: 10px; margin-bottom: 13px;}
-table, td {border-collapse: collapse;}
-/*table, td {border: 1;padding: 0}
-*/
+div.navheader table tbody tr:nth-child(2) {
+ display: none;
+}
-/* 3. Block Formatted
------------------------------------------------------ */
-pre, .literallayout { border-right-width: 0px; border-left-width: 0px; border-bottom-width: 2px; border-top-width: 2px; font-family: "DejaVu Sans", "Lucida Grande", "Verdana", Courier, mono; line-height: 16px; border-color: #f7931e; border-style: solid; font-size: 11px; margin-bottom: 10px; margin-top: 10px; overflow: auto; padding: 10px; background: #f8f8f9; -moz-border-radius: 2px; -webkit-border-radius: 2px;}
-.note { border-left-width: 0px; border-bottom-width: 2px; border-right-width: 0px; border-top-width: 2px; width: 80%; border-color: #a2d545; border-style: solid; font-size: 11px; margin-bottom: 10px; margin-top: 10px; overflow: auto; padding: 10px; background: #e4f7dd; -moz-border-radius: 2px; -webkit-border-radius: 2px;}
-/* code { border-right-style: solid; border-right-color: #79791a; border-left-color: #79791b; border-left-style: solid; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px; padding-left: 3px; padding-bottom: 1px; padding-right: 3px; padding-top: 1px; font-family: "Courier New", Courier, Monaco, monospace; color: #fefff7; background: #9b9e96; -moz-border-radius: 2px; -webkit-border-radius: 2px;} */
-.programlisting {font-family: "Courier New", Courier, Monaco, monospace;}
-.warning { border-left-width: 0px; border-bottom-width: 2px; border-right-width: 0px; border-top-width: 2px; width: 80%; border-color: #a2d545; border-style: solid; font-size: 11px; margin-bottom: 10px; margin-top: 10px; overflow: auto; padding: 10px; background: #FFE699; -moz-border-radius: 2px; -webkit-border-radius: 2px;}
+div.navfooter a {
+ text-decoration: none;
+ color: #bcF;
+}
+div.navfooter a:hover {
+ color: #e9cb2b;
+}
-/* 4. Docbook Specifics
------------------------------------------------------ */
-.question {font-weight: bold; color: #213780;}
-.term { font-weight: bold; color: #38488d;}
-.term:hover { font-weight: bold; color: #88000f;}
-.chapter { margin-top: 60px; }
-.sect1 { margin-top: 50px; }
-.sect2 { margin-top: 40px; }
-.sect3 { margin-top: 30px; }
-.caption p {font-style: italic; font-size: 90%;}
-.remark { background: #ffff00; }
-.equation {font-style: italic; font-size: 90%;}
-.command, .code {font-weight: normal; font-family: "Courier New", Courier, Monaco, monospace; color: #000000;}
-.styledtable table thead th { border-right-width: 0px; border-left-width: 0px; border-bottom-width: 1px; border-top-width: 0px; border-color: #f7931e; border-style: solid; }
-.styledtable > table { border-right-width: 0px; border-left-width: 0px; border-bottom-width: 2px; border-top-width: 2px; border-color: #f7931e; border-style: solid; }
-.styledtable table td,th { color: #000000; font-style: italic; padding-right:10px; padding-left:10px; border-right-width: 0px; border-left-width: 0px; border-bottom-width: 2px; border-top-width: 2px; border-width: 0px;}
-.pdparam {color: #990000}
+div.refnamediv {
+ display: none;
+}
+
+div.funcsynopsis code {
+ font: unset;
+}
+
+/* 2. Standard Tags ----------------------------------------------------- */
+a {
+ text-decoration: none;
+ color: #55d;
+}
+a:hover, li a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover {
+ color: #e9cb2b;
+}
+p, form, td, th, dt, li {
+/* font-size:10pt */
+}
+h1, h2 {
+ color: #579;
+}
+h3, h4, th, dt, b, div.abstract-title, div.toc-title {
+ color: #579;
+}
+h1 {
+ font-size: 175%;
+ margin-top: 1.2em;
+ margin-bottom: 0.5em;
+}
+h2 {
+ font-size: 150%;
+ margin-top: 1.2em;
+ margin-bottom: 0.5em;
+}
+h3, div.abstract-title, div.toc-title {
+ font-size: 130%;
+ margin-top: 1.1em;
+ margin-bottom: 0.4em;
+}
+h4 {
+ font-size: 120%;
+ margin-top: 1em;
+ margin-bottom: 0.3em;
+}
+h5 {
+ font-size: 110%;
+ margin-top: 1em;
+ margin-bottom: 0.3em;
+}
+table, td {
+ border-collapse: collapse;
+}
+
+
+/* 3. Block Formatted ----------------------------------------------------- */
+
+pre, .literallayout {
+ border-width: 0;
+ font-family: Consolas, Monaco, monospace;
+ border-style: solid;
+ margin-bottom: 1em;
+ margin-top: 1em;
+ overflow: auto;
+ padding: 1em;
+ background: #eee;
+ border-radius: 1em;
+}
+
+div.note {
+ font-size: 90%;
+ border-color: #dd5;
+ border-style: solid;
+ border-width: 1.5px;
+ margin-bottom: 1em;
+ margin-top: 1em;
+ overflow: auto;
+ padding: 0.8em;
+ background: #ffe;
+ border-radius: 1em;
+}
+div.note table p {
+ font-size: 90%;
+ margin: 0 0 0 0;
+ padding: 0 0 0 0;
+}
+div.note table tr td img {
+ margin: 0 0.5em 0 0;
+ padding: 0 0 0 0;
+}
+
+div.warning {
+ font-size: 90%;
+ border-color: #cc5555;
+ border-style: solid;
+ border-width: 1.5px;
+ margin-bottom: 1em;
+ margin-top: 1em;
+ overflow: auto;
+ padding: 0.8em;
+ background: #FFf1f1;
+ border-radius: 1em;
+}
+div.warning table p {
+ font-size: 90%;
+ margin: 0 0 0 0;
+ padding: 0 0 0 0;
+}
+div.warning table tr td img {
+ margin: 0 0.5em 0 0;
+ padding: 0 0 0 0;
+}
+
+div.important {
+ font-size: 90%;
+ border-color: #55d;
+ border-style: solid;
+ border-width: 1.5px;
+ margin-bottom: 1em;
+ margin-top: 1em;
+ overflow: auto;
+ padding: 0.8em;
+ background: #eef;
+ border-radius: 1em;
+}
+div.important table p {
+ font-size: 90%;
+ margin: 0 0 0 0;
+ padding: 0 0 0 0;
+}
+div.important table tr td img {
+ margin: 0 0.5em 0 0;
+ padding: 0 0 0 0;
+}
+
+span.inlinemediaobject img {
+ vertical-align: middle;
+}
+
+.programlisting {
+ font-family: Consolas, Monaco, monospace;
+}
+
+/* 4. Docbook Specifics ----------------------------------------------------- */
+
+span.emphasis {
+ font-style: italic;
+}
+
+tr.question {
+ font-weight: bold;
+ color: #248;
+}
+tr.question td {
+ padding-bottom: 0.5em;
+ padding-top: 0.4em;
+}
+
+.term {
+ font-weight: bold;
+ color: #459;
+}
+.term:hover {
+ font-weight: bold;
+ color: #801;
+}
+.chapter {
+ margin-top: 60px;
+}
+.sect1 {
+ margin-top: 50px;
+}
+.sect2 {
+ margin-top: 40px;
+}
+.sect3 {
+ margin-top: 30px;
+}
+.caption p {
+ font-style: italic;
+}
+.remark {
+ background: #ff0;
+}
+.equation {
+ font-style: italic;
+}
+.command, .code, .varname, .filename {
+ font-size: 105%;
+ font-weight: normal;
+ font-family: Consolas, Monaco, monospace;
+ color: black;
+ background-color: #eee;
+ font-weight: bold;
+}
+
+.styledtable table td,th {
+ padding: 0.5em;
+}
+
+table.informaltable {
+ border-color: #aaa;
+}
+table.informaltable td, th {
+ padding: 0.2em 0.4em 0.2em 0.4em;
+}
+
+.pdparam {
+ color: #900
+}
+
+.simplelist td {
+ padding-right: 2em;
+}
More information about the postgis-tickets
mailing list