s***@apache.org
2016-07-06 11:12:31 UTC
Author: sjur
Date: Wed Jul 6 11:12:31 2016
New Revision: 1751655
URL: http://svn.apache.org/viewvc?rev=1751655&view=rev
Log:
Better rendering of lower-level headings, and adherence to the skinconf.xsl setting ***@type (pelt only obey this setting for level 1 and 2 sections, not lower).
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1751655&r1=1751654&r2=1751655&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Wed Jul 6 11:12:31 2016
@@ -555,12 +555,16 @@ acronym {
box-shadow: 0 0 0.4em #E7E7E7;
}
+.underlined_10 {
+ border-bottom: solid 10px #E7E7E7;
+}
+
.underlined_5 {
border-bottom: solid 5px #E7E7E7;
}
-.underlined_10 {
- border-bottom: solid 10px #E7E7E7;
+.underlined_2 {
+ border-bottom: solid 2px #E7E7E7;
}
/* ==================== snail trail ============================ */
Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl?rev=1751655&r1=1751654&r2=1751655&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Wed Jul 6 11:12:31 2016
@@ -296,6 +296,46 @@ footer, searchbar, css etc. As input, i
</xsl:choose>
</xsl:template>
+ <xsl:template match="h4[not(@class='faq')]">
+ <xsl:choose>
+ <xsl:when test="//skinconfig/headings/@type='underlined'">
+ <h4 class="underlined_2">
+ <xsl:value-of select="."/>
+ </h4>
+ </xsl:when>
+ <xsl:when test="//skinconfig/headings/@type='boxed'">
+ <h4 class="boxed">
+ <xsl:value-of select="."/>
+ </h4>
+ </xsl:when>
+ <xsl:otherwise>
+ <h4>
+ <xsl:value-of select="."/>
+ </h4>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="h5">
+ <xsl:choose>
+ <xsl:when test="//skinconfig/headings/@type='underlined'">
+ <h5 class="underlined_2">
+ <xsl:value-of select="."/>
+ </h5>
+ </xsl:when>
+ <xsl:when test="//skinconfig/headings/@type='boxed'">
+ <h5 class="boxed">
+ <xsl:value-of select="."/>
+ </h5>
+ </xsl:when>
+ <xsl:otherwise>
+ <h5>
+ <xsl:value-of select="."/>
+ </h5>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
<!-- Add links to any standards-compliance logos -->
<xsl:template name="compliancy-logos">
<xsl:if test="$filename = 'index.html' and $config/disable-compliance-links = 'false'">
Date: Wed Jul 6 11:12:31 2016
New Revision: 1751655
URL: http://svn.apache.org/viewvc?rev=1751655&view=rev
Log:
Better rendering of lower-level headings, and adherence to the skinconf.xsl setting ***@type (pelt only obey this setting for level 1 and 2 sections, not lower).
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1751655&r1=1751654&r2=1751655&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Wed Jul 6 11:12:31 2016
@@ -555,12 +555,16 @@ acronym {
box-shadow: 0 0 0.4em #E7E7E7;
}
+.underlined_10 {
+ border-bottom: solid 10px #E7E7E7;
+}
+
.underlined_5 {
border-bottom: solid 5px #E7E7E7;
}
-.underlined_10 {
- border-bottom: solid 10px #E7E7E7;
+.underlined_2 {
+ border-bottom: solid 2px #E7E7E7;
}
/* ==================== snail trail ============================ */
Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl?rev=1751655&r1=1751654&r2=1751655&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Wed Jul 6 11:12:31 2016
@@ -296,6 +296,46 @@ footer, searchbar, css etc. As input, i
</xsl:choose>
</xsl:template>
+ <xsl:template match="h4[not(@class='faq')]">
+ <xsl:choose>
+ <xsl:when test="//skinconfig/headings/@type='underlined'">
+ <h4 class="underlined_2">
+ <xsl:value-of select="."/>
+ </h4>
+ </xsl:when>
+ <xsl:when test="//skinconfig/headings/@type='boxed'">
+ <h4 class="boxed">
+ <xsl:value-of select="."/>
+ </h4>
+ </xsl:when>
+ <xsl:otherwise>
+ <h4>
+ <xsl:value-of select="."/>
+ </h4>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="h5">
+ <xsl:choose>
+ <xsl:when test="//skinconfig/headings/@type='underlined'">
+ <h5 class="underlined_2">
+ <xsl:value-of select="."/>
+ </h5>
+ </xsl:when>
+ <xsl:when test="//skinconfig/headings/@type='boxed'">
+ <h5 class="boxed">
+ <xsl:value-of select="."/>
+ </h5>
+ </xsl:when>
+ <xsl:otherwise>
+ <h5>
+ <xsl:value-of select="."/>
+ </h5>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
<!-- Add links to any standards-compliance logos -->
<xsl:template name="compliancy-logos">
<xsl:if test="$filename = 'index.html' and $config/disable-compliance-links = 'false'">