lfs-css: solved some displaying issues.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3926 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 31 insertions, 33 deletions

diff --git a/Makefile b/Makefile
index 6f61edeeb..900fd3fa6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,48 +1,45 @@
-BASEDIR=~/lfs-book
-CHUNK_QUIET=0
-PDF_OUTPUT=LFS-BOOK.pdf
-PRINT_OUTPUT=LFS-BOOK-PRINTABLE.pdf
-NOCHUNKS_OUTPUT=LFS-BOOK.html
-XSLROOTDIR=/usr/share/xml/docbook/xsl-stylesheets-current
+BASEDIR=/home/macana/LFS/test-book-LFS/
 
 lfs:
-	xsltproc --xinclude --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
-	  -stringparam base.dir $(BASEDIR)/ stylesheets/lfs-chunked.xsl \
-	  index.xml
+	xsltproc --xinclude --nonet -stringparam base.dir $(BASEDIR) \
+	  stylesheets/lfs-chunked.xsl index.xml
+
+	mkdir -p $(BASEDIR)stylesheets && \
+	cp stylesheets/*.css $(BASEDIR)stylesheets
+
+	mkdir -p $(BASEDIR)images && \
+	cp /usr/share/xml/docbook/xsl-stylesheets-1.65.1/images/*.png \
+  	$(BASEDIR)images
 
-	if [ ! -e $(BASEDIR)/stylesheets ]; then \
-	  mkdir -p $(BASEDIR)/stylesheets; \
-	fi;
-	cp stylesheets/*.css $(BASEDIR)/stylesheets
-
-	if [ ! -e $(BASEDIR)/images ]; then \
-	  mkdir -p $(BASEDIR)/images; \
-	fi;
-	cp $(XSLROOTDIR)/images/*.png \
-	  $(BASEDIR)/images
-	cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" \
+	cd $(BASEDIR); sed -i -e "s@../stylesheets@stylesheets@g" \
 	  index.html part1.html part2.html part3.html longindex.html
-	cd $(BASEDIR)/; sed -i -e "s@../images@images@g" \
+	cd $(BASEDIR); sed -i -e "s@../images@images@g" \
 	  index.html part1.html part2.html part3.html longindex.html
 
-	sh goTidy $(BASEDIR)/
+	goTidy
 
 pdf:
-	xsltproc --xinclude --nonet --output lfs.fo stylesheets/lfs-pdf.xsl \
+	xsltproc --xinclude --nonet --output $(BASEDIR)lfs.fo stylesheets/lfs-pdf.xsl \
 	  index.xml
-	sed -i -e "s/inherit/all/" lfs.fo
-	fop.sh lfs.fo $(PDF_OUTPUT)
+	cd $(BASEDIR)
+	sed -i -e "s@inherit@all@" lfs.fo
+	JAVA_HOME=/opt/java/jre1.3.1_02 FOP_HOME=/home/macana/tmp/fop \
+  /home/macana/tmp/fop/fop.sh lfs.fo lfs.pdf
 
 print:
-	xsltproc --xinclude --nonet --output lfs-print.fo \
-	  stylesheets/lfs-print.xsl index.xml
-	sed -i -e "s/inherit/all/" lfs-print.fo
-	fop.sh lfs-print.fo $(PRINT_OUTPUT)
+	xsltproc --xinclude --nonet --output $(BASEDIR)lfs-print.fo stylesheets/lfs-print.xsl \
+	  index.xml
+	cd $(BASEDIR)
+	sed -i -e "s@inherit@all@" lfs-print.fo
+	JAVA_HOME=/opt/java/jre1.3.1_02 FOP_HOME=/home/macana/tmp/fop \
+  /home/macana/tmp/fop/fop.sh lfs-print.fo lfs-print.pdf
 
 nochunks:
-	xsltproc --xinclude --nonet --output $(NOCHUNKS_OUTPUT) \
+	xsltproc --xinclude --nonet --output $(BASEDIR)lfs-nochunk.html \
 	  stylesheets/lfs-nochunks.xsl index.xml
-	tidy -config tidy.conf $(NOCHUNKS_OUTPUT) || true
+	tidy -config tidy.conf $(BASEDIR)lfs-nochunk.html || true
 
 validate:
 	xmllint --noout --nonet --xinclude --postvalid index.xml
+ 
+
diff --git a/stylesheets/lfs.css b/stylesheets/lfs.css
index 44871f725..5b3399bc9 100644
--- a/stylesheets/lfs.css
+++ b/stylesheets/lfs.css
@@ -64,6 +64,7 @@ div.navheader ul, div.navfooter ul {
 
 div.navheader ul li, div.navfooter ul li {
   display: inline;
+  width: 40%;
 }
 
 div.navheader ul li.prev, div.navfooter ul li.prev {
@@ -118,13 +119,13 @@ div.toc ul li h3, div.toc ul li h4 {
 }
 
 .item {
-    width: 15em;
+    width: 17em;
     float: left;
 }
 
 .secitem {
     font-weight: normal;
-    width: 14em;
+    width: 16em;
     float: left;
 }