Explorar o código

Revising CSS code and small PDF fix.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/new-xsl@8085 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Manuel Canales Esparcia %!s(int64=18) %!d(string=hai) anos
pai
achega
6b4d0f5817
Modificáronse 2 ficheiros con 43 adicións e 56 borrados
  1. 39 52
      lfs.css
  2. 4 4
      pdf/lfs-mixed.xsl

+ 39 - 52
lfs.css

@@ -106,7 +106,7 @@ div.navfooter ul li.home, div.navfooter ul li.up {
   color: #dbddec;
   color: #dbddec;
 }
 }
 
 
-/* TOC & Index*/
+/* TOC */
 
 
 div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
 div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
   list-style: none;
   list-style: none;
@@ -134,6 +134,8 @@ div.toc ul li h4 {
   margin: .6em 0 .2em 0;
   margin: .6em 0 .2em 0;
 }
 }
 
 
+/* Index */
+
 .item {
 .item {
     float: left;
     float: left;
 }
 }
@@ -193,51 +195,25 @@ div.important em, div.warning em, div.caution em {
   font-weight: bold;
   font-weight: bold;
 }
 }
 
 
-/* table and variablelist as table */
-
-.variablelist table {
-  width: auto;
-  margin: 0 1em 0 1em;
-}
-
-.variablelist td {
-  vertical-align: top;
-}
+/* table */
 
 
-.variablelist td span, td p {
-  margin: 0.25em;
-}
-/* ---- Revised up to here (first round) ------ */
-div.table {
+.table p.title {
   text-align: center;
   text-align: center;
+  margin-top: 0;
+  margin-bottom: .3em;
 }
 }
 
 
-div.table table {
+.table table {
   margin-left: auto;
   margin-left: auto;
   margin-right: auto;
   margin-right: auto;
-  text-align: center;
 }
 }
 
 
-div.table table th, div.table table td {
+.table table th, .table table td {
   padding: 0.2em 2em 0.2em 2em;
   padding: 0.2em 2em 0.2em 2em;
-}
-
-div.table table {
-  border-collapse: collapse;
-  }
-
-div.table td, div.table th {
-  padding: 0.3em;
-  text-align: right;
-  vertical-align: baseline;
-}
-
-div.table tr > td:first-child, div.table tr > th:first-child {
   text-align: left;
   text-align: left;
 }
 }
 
 
 div.revhistory th {
 div.revhistory th {
-  text-align: left;
   line-height: 2em;
   line-height: 2em;
 }
 }
 
 
@@ -245,39 +221,50 @@ div.revhistory td {
   padding-right: 1em;
   padding-right: 1em;
 }
 }
 
 
-/* variablelist as list and segmentedlist */
-dl {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
+/* variablelist as table */
+
+.variablelist table {
+  width: auto;
+  margin: 0 1em 0 1em;
+}
+
+.variablelist td {
+  vertical-align: top;
 }
 }
 
 
+.variablelist td span, td p {
+  margin: 0.25em;
+}
+
+/* variablelist as list */
+
 dt {
 dt {
-  display: list-item;
   font-weight: bold;
   font-weight: bold;
-  margin: .33em 0 0 1em;
-  padding: 0;
+  margin-left: 1em;
 }
 }
 
 
-dd  {
-  margin: 0 0 1em 3em;
-  padding: 0;
+dd {
+  margin-bottom: .6em;
+  margin-left: 1em;
 }
 }
 
 
-div.variablelist dd {
-  margin-bottom: 1em;
+dd p {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-top: 0;
+  padding-bottom: 0;
 }
 }
 
 
-div.variablelist dd p {
-  margin-top: 0px;
-  margin-bottom: 0px;
-  padding-top: 0px;
-  padding-bottom: 0px;
+div.materials dt {
+  display: list-item;
 }
 }
 
 
 div.materials dd {
 div.materials dd {
-  margin-left: 0px;
+  margin-left: 0;
 }
 }
+/* --- Revised up to here (first round, checking LFS look only) --- */
+
+/* segmentedlist */
 
 
 div.package div.seg {
 div.package div.seg {
   margin-bottom: 0em;
   margin-bottom: 0em;

+ 4 - 4
pdf/lfs-mixed.xsl

@@ -242,12 +242,12 @@
     <xsl:choose>
     <xsl:choose>
       <xsl:when test="ancestor::variablelist/@role = 'materials'">
       <xsl:when test="ancestor::variablelist/@role = 'materials'">
         <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
         <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
-                  keep-together.within-column="always"
+                  keep-together.within-column="always" font-weight="bold"
                   keep-with-next.within-column="always" text-align="left">
                   keep-with-next.within-column="always" text-align="left">
           <xsl:text>&#x2022;   </xsl:text>
           <xsl:text>&#x2022;   </xsl:text>
           <xsl:apply-templates select="term"/>
           <xsl:apply-templates select="term"/>
         </fo:block>
         </fo:block>
-        <fo:block margin-left="1.4pc" text-align="left"
+        <fo:block text-align="left"
                   keep-together.within-column="always"
                   keep-together.within-column="always"
                   keep-with-previous.within-column="always">
                   keep-with-previous.within-column="always">
           <xsl:apply-templates select="listitem"/>
           <xsl:apply-templates select="listitem"/>
@@ -256,10 +256,10 @@
       <xsl:otherwise>
       <xsl:otherwise>
         <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
         <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
                   keep-together.within-column="always"
                   keep-together.within-column="always"
-                  keep-with-next.within-column="always">
+                  keep-with-next.within-column="always" margin-left="1em">
           <xsl:apply-templates select="term"/>
           <xsl:apply-templates select="term"/>
         </fo:block>
         </fo:block>
-        <fo:block margin-left="0.25in">
+        <fo:block margin-left="2em">
           <xsl:apply-templates select="listitem"/>
           <xsl:apply-templates select="listitem"/>
         </fo:block>
         </fo:block>
       </xsl:otherwise>
       </xsl:otherwise>