summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@gnome.org>2010-01-05 17:46:37 -0600
committerShaun McCance <shaunm@gnome.org>2010-01-05 17:46:37 -0600
commit339d7300c8c8a9da05402515d586e12035470af0 (patch)
tree83b61c538ae7274cdcf5711a94878cd930fb2b65
parenta2828a79dd45095d3e0b77d1acccebdd529e700a (diff)
downloadyelp-339d7300c8c8a9da05402515d586e12035470af0.tar.gz
Revert to using gnome-doc-utils with yelp-xsl changes merged
-rw-r--r--configure.in12
-rw-r--r--stylesheets/mal2html.xsl.in4
2 files changed, 9 insertions, 7 deletions
diff --git a/configure.in b/configure.in
index fc50441d..b6032514 100644
--- a/configure.in
+++ b/configure.in
@@ -69,7 +69,7 @@ PKG_CHECK_MODULES(YELP,
[
gio-2.0
gconf-2.0
- yelp-xsl >= 0.99.1
+ gnome-doc-utils >= 0.19.1
gtk+-unix-print-2.0
gtk+-2.0 >= 2.18.0
libxml-2.0 >= 2.6.5
@@ -84,20 +84,20 @@ AC_SUBST([YELP_LIBS])
AC_PATH_PROGS(SED, gsed sed)
-XSLT_PATH="`$PKG_CONFIG --variable=xsltdir yelp-xsl`"
+XSLT_PATH="`$PKG_CONFIG --variable=xsltdir gnome-doc-utils`"
DB_TITLE="$XSLT_PATH""/docbook/common/db-title.xsl"
AC_SUBST(DB_TITLE)
-DB2HTML="`$PKG_CONFIG --variable=db2xhtml yelp-xsl`"
+DB2HTML="`$PKG_CONFIG --variable=db2xhtml gnome-doc-utils`"
AC_SUBST(DB2HTML)
-MAL2HTML="`$PKG_CONFIG --variable=mal2xhtml yelp-xsl`"
+MAL2HTML="`$PKG_CONFIG --variable=mal2xhtml gnome-doc-utils`"
AC_SUBST(MAL2HTML)
-GDU_GETTEXT="`$PKG_CONFIG --variable=gettext yelp-xsl`"
+GDU_GETTEXT="`$PKG_CONFIG --variable=gettext gnome-doc-utils`"
AC_SUBST(GDU_GETTEXT)
-GDU_ICON_PATH="`$PKG_CONFIG --variable=icondir yelp-xsl`"
+GDU_ICON_PATH="`$PKG_CONFIG --variable=icondir gnome-doc-utils`"
AC_SUBST(GDU_ICON_PATH)
GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`"
diff --git a/stylesheets/mal2html.xsl.in b/stylesheets/mal2html.xsl.in
index a8af26a0..f01b9b8c 100644
--- a/stylesheets/mal2html.xsl.in
+++ b/stylesheets/mal2html.xsl.in
@@ -57,9 +57,11 @@
<xsl:call-template name="yelp.common.css"/>
<xsl:text>
body { padding: 0; }
-div.head {
+div.headbar {
padding: 0.2em 0 0 0;
margin: 0 0 1em 0;
+ max-width: 100%;
+ width: 100%;
background-color: </xsl:text>
<xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
border-bottom: solid 1px </xsl:text>