diff options
| -rw-r--r-- | Makefile.common | 21 | ||||
| -rw-r--r-- | css/fedora-plain.css | 149 | ||||
| -rw-r--r-- | xsl/html-common-relnotes.xsl | 2 | ||||
| -rw-r--r-- | xsl/html-common.xsl | 2 |
4 files changed, 165 insertions, 9 deletions
diff --git a/Makefile.common b/Makefile.common index c397bda..cb75df1 100644 --- a/Makefile.common +++ b/Makefile.common @@ -32,7 +32,7 @@ sinclude Make.paths # Supply default values for the boilerplate files _unless_ the user has # provided their own values. ifeq (${FDPDIR},) -FDPDIR = .. +FDPDIR = .. endif ifeq (${XSLPDF},) XSLPDF = ${FDPDIR}/docs-common/xsl/main-pdf.xsl @@ -43,6 +43,12 @@ endif ifeq (${XSLHTMLNOCHUNKS},) XSLHTMLNOCHUNKS = ${FDPDIR}/docs-common/xsl/main-html-nochunks.xsl endif +ifeq (${HTMLCSS},) +HTMLCSS = ${FDPDIR}/docs-common/css/fedora-draft.css +endif +ifeq (${HTMLCSSEXTRA},) +HTMLCSSEXTRA = ${FDPDIR}/docs-common/images/watermark.png +endif ######################################################################### # Define a macro to locate xmlto(1) so we can choose a specific version # by "make XMLTO=/path/to/xmlto", if we so desire. @@ -64,7 +70,8 @@ ${TARGETS}:: # LANG=en.UTF-8 ${XMLTO} html -x $(XSLHTML) -o mydoc-en mydoc-en.xml # mkdir -p mydoc-en/stylesheet-images # cp ${FDPDIR}/docs-common/stylesheet-images/*.png mydoc-en/stylesheet-images/ -# cp ${FDPDIR}/docs-common/css/fedora*.css mydoc-en/ +# cp ${HTMLCSS} mydoc-en/fedora.css +# cp ${HTMLCSSEXTRA} mydoc-en/ # cp ${FDPDIR}/docs-common/images/watermark.png mydoc-en/ # mkdir -p mydoc-en/figs # cp -p figs/*-${LANG}.* mydoc-en/figs @@ -77,8 +84,8 @@ ${DOCBASE}-$(1)/index.html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1)) LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(DOCBASE)-$(1).xml mkdir -p $(DOCBASE)-$(1)/stylesheet-images/ cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images - cp ${FDPDIR}/docs-common/css/fedora*.css $$(DOCBASE)-$(1)/ - cp ${FDPDIR}/docs-common/images/watermark.png $${DOCBASE}-$(1)/ + cp ${HTMLCSS} $$(DOCBASE)-$(1)/fedora.css + cp ${HTMLCSSEXTRA} $$(DOCBASE)-$(1)/ [ ! -d figs ] || ( \ mkdir -p ${DOCBASE}-$(1)/figs; \ find figs -type f -iname '*.*' -print | \ @@ -99,8 +106,8 @@ ${DOCBASE}-$(1).html:: ${DOCBASE}-$(1).xml $$(XMLEXTRAFILES-$(1)) ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(DOCBASE)-$(1).xml mkdir -p stylesheet-images/ cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/ - cp ${FDPDIR}/docs-common/css/fedora*.css . - cp ${FDPDIR}/docs-common/images/watermark.png . + cp ${HTMLCSS} $$(DOCBASE)-$(1)/fedora.css + cp ${HTMLCSSEXTRA} $$(DOCBASE)-$(1)/ endef # html-nochunks:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).html) @@ -139,7 +146,7 @@ ${DOCBASE}-$(1)-clean:: ${RM} -r ${DOCBASE}-$(1).html stylesheet-images ${RM} -r ${DOCBASE}-$(1).pdf ${RM} -r ${DOCBASE}-$(1).tar.gz - ${RM} fedora*.css watermark.png + ${RM} fedora.css watermark.png endef # distclean clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean) diff --git a/css/fedora-plain.css b/css/fedora-plain.css new file mode 100644 index 0000000..24cccdb --- /dev/null +++ b/css/fedora-plain.css @@ -0,0 +1,149 @@ +/* + +CSS for Red Hat Linux Project docs from the Documentation Project + +Written by Tammy Fox and Garrett LeSage + +Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc. + +License: GPL + +*/ + +/* +This "body" section is included for reference. Diff with fedora-draft.css +body { + background-attachment scroll; + background-color: #FEFEFF; + background-image: url('watermark.png'); + background-position: top center; + background-repeat: repeat; +} +*/ + +li p { + display: inline; +} + +div.table table { + width: 95%; + background-color: #DCDCDC; + color: #000000; + border-spacing: 0; +} + +div.table table th { + border: 1px solid #A9A9A9; + background-color: #A9A9A9; + color: #000000; +} + +div.table table td { + border: 1px solid #A9A9A9; + background-color: #DCDCDC; + color: #000000; + padding: 0.5em; + margin-bottom: 0.5em; + margin-top: 2px; + +} + +div.note table, div.tip table, div.important table, div.caution table, div.warning table { + width: 95%; + border: 2px solid #D0D0B0; + background-color: #FAF9E0; + color: #000000; + /* padding inside table area */ + padding: 0.5em; + margin-bottom: 0.5em; + margin-top: 0.5em; +} + +.qandaset table { + border-collapse: collapse; +} +.qandaset { +} +.qandaset tr.question { +} +.qandaset tr.question td { + font-weight: bold; + padding: 1em 1em 0; +} +.qandaset tr.answer td { + padding: 0.25em 1em 1.5em; +} +.qandaset tr.question td, .qandaset tr.answer td { +} + +hr { + border: 0; + border-bottom: 1px solid #ccc; +} + +h1, h2, h3, h4 { + font-family: luxi sans,sans-serif; + color: #22437f; + font-weight: bold; +} +h1 { + font-size: 1.75em; +} + +h2 { + font-size: 1.25em; +} + +h3 { + font-size: 1.1em; +} + +a:link { + color: #900; +} +a:visited { + color: #48468f; +} +a:hover { + color: #f20; +} + +code.screen, pre.screen { + font-family: monospace; + font-size: 1em; + display: block; + padding: 10px; + border: 1px solid #bbb; + background-color: #eee; + color: #000; + overflow: auto; + border-radius: 2.5px; + -moz-border-radius: 2.5px; + margin: 0.5em 2em; +} + +div.example { + padding: 10px; + border: 1px solid #bbb; + margin: 0.5em 2em; +} + +.procedure ol li { + margin-bottom: 0.5em; +} +.procedure ol li li { + /* prevent inheritance */ + margin-bottom: 0em; +} + +.itemizedlist ul li { + margin-bottom: 0.5em; +} +.itemizedlist ul li li { + /* prevent inheritance */ + margin-bottom: 0em; +} + +p.title { + text-align: center; +} diff --git a/xsl/html-common-relnotes.xsl b/xsl/html-common-relnotes.xsl index c9ae686..49564d9 100644 --- a/xsl/html-common-relnotes.xsl +++ b/xsl/html-common-relnotes.xsl @@ -30,7 +30,7 @@ disable for FC4 <xsl:param name="generate.legalnotice.link" select="1"></xsl:param> --> -<xsl:param name="html.stylesheet" select="'fedora-draft.css'"></xsl:param> +<xsl:param name="html.stylesheet" select="'fedora.css'"></xsl:param> <xsl:param name="html.stylesheet.type">text/css</xsl:param> <xsl:param name="html.cleanup" select="1"></xsl:param> diff --git a/xsl/html-common.xsl b/xsl/html-common.xsl index 41270ef..826b59c 100644 --- a/xsl/html-common.xsl +++ b/xsl/html-common.xsl @@ -25,7 +25,7 @@ procedure after <xsl:output method="html" indent="no"/> -<xsl:param name="html.stylesheet" select="'fedora-draft.css'"></xsl:param> +<xsl:param name="html.stylesheet" select="'fedora.css'"></xsl:param> <xsl:param name="html.stylesheet.type">text/css</xsl:param> <xsl:param name="html.cleanup" select="1"></xsl:param> |