Author: kpreisser Date: Fri Sep 27 14:48:41 2013 New Revision: 1526918 URL: http://svn.apache.org/r1526918 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55383 Improve CSS: - Use media queries in the main CSS file to better control when CSS styles should not be applied for printing. - Use "noPrint" class for ASF logo.
Modified: tomcat/trunk/webapps/docs/images/docs-stylesheet.css tomcat/trunk/webapps/docs/tomcat-docs.xsl Modified: tomcat/trunk/webapps/docs/images/docs-stylesheet.css URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/images/docs-stylesheet.css?rev=1526918&r1=1526917&r2=1526918&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/images/docs-stylesheet.css (original) +++ tomcat/trunk/webapps/docs/images/docs-stylesheet.css Fri Sep 27 14:48:41 2013 @@ -58,10 +58,15 @@ main { } #header { - box-shadow: 0 0 7px #aaa; border-bottom: 1px solid #bbb; } +@media not print { + #header { + box-shadow: 0 0 7px #aaa; + } +} + #header > div { padding-left: 15px; padding-right: 15px; @@ -182,8 +187,13 @@ main { padding-left: 5px; padding-right: 5px; background-color: #eaeaea; - border: 1px solid #ccc; - border-radius: 4px; +} + +@media not print { + #content h3, #content h4, #content h5, #content h6 { + border: 1px solid #ccc; + border-radius: 4px; + } } #content h4, #content h5, #content h6 { @@ -267,3 +277,11 @@ ul.changelog li{ ul.changelog img { vertical-align: middle } + + +/* Printer-only Styles */ +@media print { + .noPrint { display: none; } + #middle > div > div#mainLeft { display: none; } + a { color: inherit; text-decoration: none; } +} \ No newline at end of file Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1526918&r1=1526917&r2=1526918&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Fri Sep 27 14:48:41 2013 @@ -72,11 +72,6 @@ <xsl:value-of select="$relative-path"/><xsl:value-of select="$home-stylesheet"/> </xsl:variable> <link href="{$css-src}" rel="stylesheet" type="text/css"/> - <style type="text/css" media="print"><![CDATA[ - .noPrint { display: none; } - #middle > div > div#mainLeft { display: none; } - a { color: inherit; text-decoration: none; } - ]]></style> <title><xsl:value-of select="project/title"/> (<xsl:value-of select="$version"/>) - <xsl:value-of select="properties/title"/></title> <xsl:for-each select="properties/author"> @@ -159,7 +154,7 @@ <xsl:variable name="src"> <xsl:value-of select="$relative-path"/><xsl:value-of select="$apache-logo"/> </xsl:variable> - <div class="asfLogo"> + <div class="asfLogo noPrint"> <a href="http://www.apache.org/" target="_blank"><img src="{$src}" alt="The Apache Software Foundation" style="width: 266px; height: 83px;"/></a> </div> <h1><xsl:value-of select="$project/title"/></h1> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org