Several changes in the CSS code and navigational stuff.

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

2 files changed, 101 insertions, 72 deletions

diff --git a/stylesheets/lfs.css b/stylesheets/lfs.css
index 6c8a0fce3..53bc65c69 100644
--- a/stylesheets/lfs.css
+++ b/stylesheets/lfs.css
@@ -3,7 +3,6 @@ body {
   font-family: sans-serif;
   text-align: left;
   background: #fff;
-  color: #333;
   margin: 1em;
   padding: 0;
   font-size: 1em;
@@ -22,29 +21,28 @@ h1, h2, b, strong {
 }
 
 h3, h4, h5, h6 {
-  color: #222;
 }
 
-h1 { font-size: 200%; text-align: center; }
-h2 { font-size: 170%; padding-top: 0; margin-top: 0.5em; }
+h1 { font-size: 173%; text-align: center; }
+h2 { font-size: 144%; padding-top: 0.2em; margin-top: 0.3em; }
 h2.subtitle { text-align: center; }
-h3 { font-size: 140%; }
+h3 { font-size: 120%; }
 h4 { font-size: 110%;}
 h5, h6 { font-size: 110%; font-style: italic; }
 
 /* Navigation */
 div.headertitles h4 {
-  margin-bottom: 0px;
+  margin-bottom: 2px;
 }
 
 div.headertitles h3 {
-  margin-top: 0px;
+  margin-top: 2px;
 }
 
 div.navheader, div.navfooter {
   background: #ecedef;
   text-align: center;
-  padding: 0.2em 1em;
+  padding: 0.1em 1em;
   border-bottom: 1px solid #dbddec;
 }
 
@@ -54,7 +52,7 @@ div.navfooter {
 }
 
 div.navheader ul, div.navfooter ul {
-  padding: .3em;
+  padding: .2em;
   text-align: center;
   position: relative;
   background: #dbddec;
@@ -71,12 +69,25 @@ div.navheader ul li.prev a, div.navfooter ul li.prev a {
   padding: 0 .5em;
 }
 
+div.navheader ul li.prev p, div.navfooter ul li.prev p {
+  position: absolute;
+  left: 0;
+  text-align: left;
+  padding: 0 .5em;
+}
+
 div.navheader ul li.next a, div.navfooter ul li.next a {
   position: absolute;
   right: 0;
   text-align: right;
   padding: 0 .5em;
-  background: #dbddec;
+}
+
+div.navheader ul li.next p, div.navfooter ul li.next p {
+  position: absolute;
+  right: 0;
+  text-align: right;
+  padding: 0 .2em;
 }
 
 div.navheader ul li.home, div.navheader ul li.up,
@@ -84,6 +95,7 @@ div.navfooter ul li.home, div.navfooter ul li.up {
   padding: 0;
   margin: 0;
   display: block;
+  color: #dbddec;
 }
 
 /* TOC & Index*/
@@ -117,7 +129,8 @@ div.toc ul li h3, div.toc ul li h4 {
 
 /* Admonitions */
 div.admonition {
-  border: medium solid;
+  background-color: #fffff6;
+  border: medium solid #600;
   width: 90%;
   margin: .5em auto;
 }
@@ -142,10 +155,8 @@ tt, code, kbd, pre, .command {
 }
 
 pre.screen {
-  color: #600;
-  background-color: #ffffe0;
-  border: 1px solid #eeeed0;
-  padding: .5em 2em;
+  background-color: #e5e5e5;
+  padding: .2em 2em;
   margin: 0;
   font-weight: bold;
 }
@@ -179,37 +190,40 @@ p, ul, dl, code, blockquote {
 /* Sections */
 div.wrap h1 {
   background: #f5f6f7;
-  padding: 0.8em 0 0.5em 0;
+  padding: 0.5em 0 0.3em 0;
+  border-bottom: 0.1em solid #dbddec;
   margin: 0;
 }
 
 div.package {
-  background: #f5f6f7;
-  border-bottom: .3em solid #dbddec;
-  padding: 0 0.5em 1em 0.5em;
+  border-bottom: 0.2em solid #dbddec;
+  padding: 0 0.5em 0.3em 0.5em;
   margin: 0;
 }
 
 div.installation {
-  background:   #fefefe;
-  padding: 0 0.5em 0.5em 0.5em;
-  margin: .5em 0 .5em 0;
+  padding: 0 0.5em 0.3em 0.5em;
+  margin: 0.5em 0 0.5em 0;
+}
+
+div.configuration {
+  border-top: 0.2em solid #dbddec;
+  padding: 0.5em 0.5em 0.5em 0.5em;
+  margin: 0.5em 0 .5em 0;
 }
 
 div.content {
-  background: #f5f6f7;
-  border-top: .3em solid #dbddec;
-  padding: 1em 0.5em 0.5em 0.5em;
-  margin: .5em 0 .5em 0;
+  border-top: 0.2em solid #dbddec;
+  padding: 0.5em 0.5em 0.5em 0.5em;
+  margin: 0.5em 0 .5em 0;
 }
 
 div.installation h2, div.content h2 {
-  padding-top: 0.4em;
+  padding-top: 0.3em;
   margin: 0;
 }
 
 div.book, div.preface, div.part, div.chapter, div.sect1, div.index {
-  background:   #fefefe;
   padding-bottom: 0.5em;
 }
 
diff --git a/stylesheets/xhtml/lfs-navigational.xsl b/stylesheets/xhtml/lfs-navigational.xsl
index fb96b7ad1..cfed29ede 100644
--- a/stylesheets/xhtml/lfs-navigational.xsl
+++ b/stylesheets/xhtml/lfs-navigational.xsl
@@ -54,6 +54,9 @@
                   <xsl:with-param name="direction" select="'prev'"/>
                 </xsl:call-template>
               </a>
+              <p>
+                <xsl:value-of select="$prev/title"/>
+              </p>
             </li>
           </xsl:if>
           <xsl:if test="count($next)&gt;0">
@@ -71,25 +74,29 @@
                   <xsl:with-param name="direction" select="'next'"/>
                 </xsl:call-template>
               </a>
+              <p>
+                <xsl:value-of select="$next/title"/>
+              </p>
             </li>
           </xsl:if>
-          <xsl:if test="count($up)&gt;0 and $up != $home">
             <li class="up">
-              <a accesskey="u">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$up"/>
+              <xsl:if test="count($up)&gt;0 and $up != $home">
+                <a accesskey="u">
+                  <xsl:attribute name="href">
+                    <xsl:call-template name="href.target">
+                      <xsl:with-param name="object" select="$up"/>
+                    </xsl:call-template>
+                  </xsl:attribute>
+                  <xsl:attribute name="title">
+                    <xsl:apply-templates select="$up" mode="object.title.markup"/>
+                  </xsl:attribute>
+                  <xsl:call-template name="navig.content">
+                    <xsl:with-param name="direction" select="'up'"/>
                   </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:apply-templates select="$up" mode="object.title.markup"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'up'"/>
-                </xsl:call-template>
-              </a>
+                </a>
+              </xsl:if>
+              <xsl:text>.</xsl:text>
             </li>
-          </xsl:if>
           <li class="home">
             <a accesskey="h">
               <xsl:attribute name="href">
@@ -139,6 +146,9 @@
                   <xsl:with-param name="direction" select="'prev'"/>
                 </xsl:call-template>
               </a>
+              <p>
+                <xsl:value-of select="$prev/title"/>
+              </p>
             </li>
           </xsl:if>
           <xsl:if test="count($next)&gt;0">
@@ -156,44 +166,49 @@
                   <xsl:with-param name="direction" select="'next'"/>
                 </xsl:call-template>
               </a>
+              <p>
+                <xsl:value-of select="$next/title"/>
+              </p>
             </li>
           </xsl:if>
-          <xsl:if test="count($up)&gt;0 and $up != $home">
             <li class="up">
-              <a accesskey="u">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$up"/>
+              <xsl:if test="count($up)&gt;0 and $up != $home">
+                <a accesskey="u">
+                  <xsl:attribute name="href">
+                    <xsl:call-template name="href.target">
+                      <xsl:with-param name="object" select="$up"/>
+                    </xsl:call-template>
+                  </xsl:attribute>
+                  <xsl:attribute name="title">
+                    <xsl:apply-templates select="$up" mode="object.title.markup"/>
+                  </xsl:attribute>
+                  <xsl:call-template name="navig.content">
+                    <xsl:with-param name="direction" select="'up'"/>
                   </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:apply-templates select="$up" mode="object.title.markup"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'up'"/>
-                </xsl:call-template>
-              </a>
+                </a>
+              </xsl:if>
+              <xsl:text>.</xsl:text>
             </li>
-          </xsl:if>
-          <xsl:if  test="$home != .">
             <li class="home">
-              <a accesskey="h">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$home"/>
+              <xsl:if  test="$home != .">
+                <a accesskey="h">
+                  <xsl:attribute name="href">
+                    <xsl:call-template name="href.target">
+                      <xsl:with-param name="object" select="$home"/>
+                    </xsl:call-template>
+                  </xsl:attribute>
+                  <xsl:attribute name="title">
+                    <xsl:value-of select="$home/bookinfo/title"/>
+                    <xsl:text> - </xsl:text>
+                    <xsl:value-of select="$home/bookinfo/subtitle"/>
+                  </xsl:attribute>
+                  <xsl:call-template name="navig.content">
+                    <xsl:with-param name="direction" select="'home'"/>
                   </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="$home/bookinfo/title"/>
-                  <xsl:text> - </xsl:text>
-                  <xsl:value-of select="$home/bookinfo/subtitle"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'home'"/>
-                </xsl:call-template>
-              </a>
+                </a>
+              </xsl:if>
+              <xsl:text>.</xsl:text>
             </li>
-          </xsl:if>
         </ul>
       </div>
     </xsl:if>