[yelp-xsl] Common "sectionlinks" styling for DocBook and Mallard

[Shaun McCance <shaunm src gnome org>]

commit 735540d74b66b97eefe74841a327c4a73f96e57b
Author: Shaun McCance <shaunm gnome org>
Date:   Tue Nov 2 16:22:47 2010 -0400

    Common "sectionlinks" styling for DocBook and Mallard

 xslt/common/html.xsl                  |   40 +++++++++++++++++++++++++++++++++
 xslt/docbook/html/db2html-autotoc.xsl |   16 +++++++-----
 xslt/docbook/html/db2html-css.xsl     |   34 ++++-----------------------
 xslt/mallard/html/mal2html-page.xsl   |   24 -------------------
 4 files changed, 54 insertions(+), 60 deletions(-)
---
diff --git a/xslt/common/html.xsl b/xslt/common/html.xsl
index 981242e..6743c29 100644
--- a/xslt/common/html.xsl
+++ b/xslt/common/html.xsl
@@ -595,6 +595,46 @@ div.contents + div.desc { margin: 0.2em 0 0 0; }
 pre.contents {
   padding: 0.5em 1em 0.5em 1em;
 }
+div.links &gt; div.title {
+  margin-top: 1em;
+  margin-bottom: 0.5em;
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1em;
+}
+div.links &gt; div.title &gt; span.title {
+  border-bottom: solid 1px </xsl:text>
+    <xsl:value-of select="$color.gray_border"/><xsl:text>;
+}
+div.links ul { margin: 0; padding: 0; }
+li.links {
+  margin: 0.5em 0 0.5em 0;
+  padding: 0;
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1em;
+  list-style-type: none;
+}
+div.sectionlinks {
+  display: inline-block;
+  padding: 0 1em 0 1em;
+  background-color: </xsl:text>
+    <xsl:value-of select="$color.blue_background"/><xsl:text>;
+  border: solid 1px </xsl:text>
+    <xsl:value-of select="$color.blue_border"/><xsl:text>;
+}
+div.sectionlinks ul { margin: 0; }
+div.sectionlinks li { padding: 0; }
+div.sectionlinks div.title { margin: 0.5em 0 0.5em 0; }
+div.sectionlinks div.title span.title {
+  border-bottom: solid 1px </xsl:text>
+    <xsl:value-of select="$color.blue_border"/><xsl:text>;
+}
+div.sectionlinks div.sectionlinks {
+  display: block;
+  margin: 0.5em 0 0 0;
+  padding: 0;
+  border: none;
+}
+div.sectionlinks div.sectionlinks li {
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.44em;
+}
 pre.linenumbering {
   margin: 0;
   padding: 0.5em;
diff --git a/xslt/docbook/html/db2html-autotoc.xsl b/xslt/docbook/html/db2html-autotoc.xsl
index 2578642..9c42bbe 100644
--- a/xslt/docbook/html/db2html-autotoc.xsl
+++ b/xslt/docbook/html/db2html-autotoc.xsl
@@ -76,17 +76,19 @@ ${titleabbrev} element specifies whether list elements should use the
 
   <xsl:param name="titleabbrev" select="false()"/>
   <xsl:if test="($selected = false()) or ($node = $selected/ancestor-or-self::*)">
-    <div class="autotoc">
+    <div class="links sectionlinks">
       <xsl:if test="$show_title">
         <div class="title autotoc-title">
-          <xsl:call-template name="l10n.gettext">
-            <xsl:with-param name="msgid" select="'Contents'"/>
-          </xsl:call-template>
+          <span class="title">
+            <xsl:call-template name="l10n.gettext">
+              <xsl:with-param name="msgid" select="'Contents'"/>
+            </xsl:call-template>
+          </span>
         </div>
       </xsl:if>
       <ul>
         <xsl:if test="$show_info">
-          <li>
+          <li class="links">
             <xsl:choose>
               <xsl:when test="$is_info">
                 <xsl:call-template name="l10n.gettext">
@@ -156,7 +158,7 @@ For a description of the other parameters, see *{db2html.autotoc}.
       <xsl:text>abbrev</xsl:text>
     </xsl:if>
   </xsl:variable>
-  <li>
+  <li class="links">
     <xsl:choose>
       <xsl:when test="set:has-same-node(., $selected) and not($is_info)">
         <xsl:call-template name="db.xref.content">
@@ -207,7 +209,7 @@ For a description of the other parameters, see *{db2html.autotoc}.
       <xsl:text>abbrev</xsl:text>
     </xsl:if>
   </xsl:variable>
-  <li>
+  <li class="links">
     <xsl:choose>
       <xsl:when test="set:has-same-node(., $selected)">
         <xsl:call-template name="db.xref.content">
diff --git a/xslt/docbook/html/db2html-css.xsl b/xslt/docbook/html/db2html-css.xsl
index 3b38311..046fa05 100644
--- a/xslt/docbook/html/db2html-css.xsl
+++ b/xslt/docbook/html/db2html-css.xsl
@@ -153,41 +153,17 @@ div.sidenav {
   background-color: </xsl:text><xsl:value-of select="$theme.color.background"/><xsl:text>;
   border: solid 1px </xsl:text><xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
 }
-div.sidenav div.autotoc {
+div.sidenav div.sectionlinks {
   background-color: </xsl:text><xsl:value-of select="$theme.color.background"/><xsl:text>;
   border: none; padding: 0; margin: 0;
 }
-div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
-div.sidenav div.autotoc li { margin-bottom: 0.5em; }
-div.sidenav div.autotoc div.autotoc div.autotoc {
+div.sidenav div.sectionlinks li { margin-bottom: 0.5em; }
+div.sidenav div.sectionlinks div.sectionlinks div.sectionlinks {
   margin-top: 0;
   margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1em;
-  -webkit-margin-start: 1em;
-  -webkit-margin-end: 0;
-  -moz-margin-start: 1em;
-  -moz-margin-end: 0;
-}
-div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
-
-<!-- == autotoc == -->
-div.autotoc {
-  <!-- FIXME: hack -->
-  display: table;
-  margin-top: 1em;
-  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.72em;
-  -webkit-margin-start: 1.72em;
-  -webkit-margin-end: 0;
-  -moz-margin-start: 1.72em;
-  -moz-margin-end: 0;
-  padding: 0.5em 1em 0.5em 1em;
-  background-color: </xsl:text><xsl:value-of select="$theme.color.blue_background"/><xsl:text>;
-  border: solid 1px </xsl:text><xsl:value-of select="$theme.color.blue_border"/><xsl:text>;
+  margin-</xsl:text><xsl:value-of select="$right"/><xsl:text>: 0;
 }
-div.autotoc ul { margin: 0; padding: 0; }
-div.autotoc li { list-style-type: none; margin: 0; }
-div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
-div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
-div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+div.sidenav div.sectionlinks div.sectionlinks div.sectionlinks li { margin-bottom: 0; }
 
 <!-- == bibliography == -->
 span.bibliolabel {
diff --git a/xslt/mallard/html/mal2html-page.xsl b/xslt/mallard/html/mal2html-page.xsl
index 93041ce..8f8484c 100644
--- a/xslt/mallard/html/mal2html-page.xsl
+++ b/xslt/mallard/html/mal2html-page.xsl
@@ -757,30 +757,6 @@ div.copyrights {
     <xsl:value-of select="$color.text_light"/><xsl:text>;
 }
 
-div.links &gt; div.title { margin: 1em 0 0.5em 1em; }
-div.links &gt; div.title &gt; span.title {
-  border-bottom: solid 1px </xsl:text>
-    <xsl:value-of select="$color.gray_border"/><xsl:text>;
-}
-div.links ul { margin: 0; padding: 0; }
-li.links { margin: 0.5em 0 0 0; padding: 0 0 0 1em; list-style-type: none; }
-
-div.sectionlinks {
-  display: inline-block;
-  padding: 0.5em 1em 0.5em 1em;
-  background-color: </xsl:text>
-    <xsl:value-of select="$color.blue_background"/><xsl:text>;
-  border: solid 1px </xsl:text>
-    <xsl:value-of select="$color.blue_border"/><xsl:text>;
-}
-div.sectionlinks div.title { margin: 0; }
-div.sectionlinks ul { margin: 0; }
-div.sectionlinks li { padding: 0; }
-div.sectionlinks div.title span.title {
-  border-bottom: solid 1px </xsl:text>
-    <xsl:value-of select="$color.blue_border"/><xsl:text>;
-}
-
 table.twocolumn { width: 100%; }
 td.twocolumnleft { width: 48%; vertical-align: top; padding: 0; margin: 0; }
 td.twocolumnright {