Date: Fri, 8 Mar 2013 09:33:05 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41134 - in projects/xml-tools/share: misc xsl Message-ID: <201303080933.r289X5WV040655@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Fri Mar 8 09:33:05 2013 New Revision: 41134 URL: http://svnweb.freebsd.org/changeset/doc/41134 Log: - Fix formatting of warning, tip, etc. Modified: projects/xml-tools/share/misc/docbook.css projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Modified: projects/xml-tools/share/misc/docbook.css ============================================================================== --- projects/xml-tools/share/misc/docbook.css Fri Mar 8 09:02:34 2013 (r41133) +++ projects/xml-tools/share/misc/docbook.css Fri Mar 8 09:33:05 2013 (r41134) @@ -31,12 +31,6 @@ body address { margin: .6em 0; } -body blockquote { - margin-top: .75em; - line-height: 1.3; - margin-bottom: .75em; -} - html body { margin: 1em 8% 1em 10%; line-height: 1.2; @@ -70,7 +64,6 @@ body form { margin: .6em 0; } -h1, h2, h3, h4, h5, h6, div.example p b, .question, div.table p b, @@ -78,24 +71,26 @@ div.procedure p b { color: #990000; } -body h1, body h2, body h3, body h4, body h5, body h6 { +h1.title, h2.title, h3.title, h4.title, h5.title, h6.title, +h3.author { line-height: 1.3; margin-left: 0; + color: #990000; } -body h1, body h2 { +h1.title, h2.title { margin: .8em 0 0 -4%; } -body h3, body h4 { +h3.title, h4.title { margin: .8em 0 0 -3%; } -body h5 { +h5.title { margin: .8em 0 0 -2%; } -body h6 { +h6.title { margin: .8em 0 0 -1%; } @@ -167,6 +162,7 @@ svnref { padding: 1ex; background-color: #eee; border: 1px solid #ccc; + border-radius: 6px; line-height: 1.1; } @@ -179,12 +175,11 @@ svnref { text-align: left; } -blockquote, .example, .programlisting { +.note, .tip, .important, .warning, .caution, .example { border-radius: 6px; -} - -blockquote { - padding: 0 2ex; + padding: 2ex 2ex; + margin: .75em 3em .75em 3em; + line-height: 1.3; } .note { @@ -229,6 +224,16 @@ blockquote { width: 90%; } +.admontitle { + display: inline; + line-height: 1; + margin-right: 0; +} + +.note p, .tip p, .important p, .warning p, .caution p, .example p { + display: inline; +} + .informaltable table.calstable tr td { padding-left: 1em; padding-right: 1em; Modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Fri Mar 8 09:02:34 2013 (r41133) +++ projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Fri Mar 8 09:33:05 2013 (r41134) @@ -17,6 +17,7 @@ <xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/> <xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/> <xsl:param name="citerefentry.link" select="1"/> + <xsl:param name="admon.style"/> <xsl:template name="user.footer.content"> <p align="center"><small>This, and other documents, can be downloaded @@ -38,4 +39,27 @@ <xsl:text>&amp;sektion=</xsl:text> <xsl:value-of select="manvolnum"/> </xsl:template> + + <xsl:template name="nongraphical.admonition"> + <div> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="inherit" select="1"/> + </xsl:call-template> + <xsl:if test="$admon.style"> + <xsl:attribute name="style"> + <xsl:value-of select="$admon.style"/> + </xsl:attribute> + </xsl:if> + + <xsl:if test="$admon.textlabel != 0 or title or info/title"> + <h3 class="admontitle"> + <xsl:call-template name="anchor"/> + <xsl:apply-templates select="." mode="object.title.markup"/> + <xsl:text>: </xsl:text> + </h3> + </xsl:if> + + <xsl:apply-templates/> + </div> + </xsl:template> </xsl:stylesheet>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303080933.r289X5WV040655>