Mercurial > hg > nginx-site

changeset 112:d3e240f7157c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Inside the "directive" prologue block, addressed the vertical alignment issue via a different mean, and made default text render as multi-line.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 20 Oct 2011 13:26:11 +0000
parents f31230984540
children f9fe7330f8e8
files xsls/directive.xsls xsls/style.xsls
diffstat 2 files changed, 28 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/xsls/directive.xsls	Thu Oct 20 13:09:11 2011 +0000
+++ b/xsls/directive.xsls	Thu Oct 20 13:26:11 2011 +0000
@@ -19,7 +19,7 @@
     X:template = "syntax" {
         X:if "position() = 1" {
             X:text disable-output-escaping="yes" {
-                &lt;tr valign="top"&gt;
+                &lt;tr&gt;
                 &lt;td&gt;
             }
             <strong>
@@ -30,7 +30,6 @@
                 &lt;/td&gt;
                 &lt;td&gt;
             }
-            <strong>&#8203;</strong>
         }
         <code>
         !{../@name}
@@ -55,7 +54,7 @@
     X:template = "default" {
         X:if "position() = 1" {
             X:text disable-output-escaping="yes" {
-                &lt;tr valign="top"&gt;
+                &lt;tr&gt;
                 &lt;td&gt;
             }
             <strong>
@@ -73,17 +72,15 @@
                        /i18n/text[@lang = $LANG]/item[@id='none']}
             </strong>
         } else {
-            <strong>&#8203;</strong>
-            <code>
+            <pre>
             !{../@name}
             X:if "count(../syntax[@block='yes'])" {
                 X:text{ \{} !!; X:text{\}}
             } else {
                 X:text{ } !!; X:text{;}
             }
-            </code>
+            </pre>
         }
-        <br/>
         X:if "position() = last()" {
             X:text disable-output-escaping="yes" {
                 &lt;/td&gt;
@@ -95,7 +92,7 @@
     X:template = "context" {
         X:if "position() = 1" {
             X:text disable-output-escaping="yes" {
-                &lt;tr valign="top"&gt;
+                &lt;tr&gt;
                 &lt;td&gt;
             }
             <strong>
@@ -106,7 +103,6 @@
                 &lt;/td&gt;
                 &lt;td&gt;
             }
-            <strong>&#8203;</strong>
         }
         X:if "count(node()) = 0" {
             <strong>
--- a/xsls/style.xsls	Thu Oct 20 13:09:11 2011 +0000
+++ b/xsls/style.xsls	Thu Oct 20 13:26:11 2011 +0000
@@ -3,25 +3,33 @@
 X:template style (lang) {
 
     <style type="text/css">!{ normalize-space('
-        html             {-webkit-text-size-adjust: none}
-        body             { font-family:  Georgia, serif; }
-        p                { text-align:   justify; }
-        div.directive    { background:   #EEEEEE;
-                           padding:      10pt 10pt 10pt 20pt; }
-        span.initial     { font-size:    200%;
-                           float: left; padding-right: 10pt;}
-        li               { text-align:   justify; }
-        td.list          { background:   #EEEEEE; }
-        blockquote.note  { text-align:   justify;
-                           background:   #EEEEEE; border: none;
-                           padding:      10pt 10pt 10pt 10pt; }
+        html              { -webkit-text-size-adjust: none; }
+        body              { font-family:    Georgia, serif; }
+        p                 { text-align:     justify; }
+        div.directive     { background:     #EEEEEE;
+                            padding:        10pt 10pt 10pt 20pt; }
+        div.directive td  { vertical-align: baseline; }
+        div.directive pre { padding:        0;
+                            margin:         0; }
+        span.initial      { font-size:      200%;
+                            float:          left;
+                            padding-right:  10pt;}
+        li                { text-align:     justify; }
+        td.list           { background:     #EEEEEE; }
+        blockquote.note   { text-align:     justify;
+                            background:     #EEEEEE;
+                            border:         none;
+                            padding:        10pt 10pt 10pt 10pt; }
         ') }
 
     X:if "$lang = 'he'" {
         !{ normalize-space('
-        pre              { text-align:   left; direction: ltr; }
-        code             { direction:    ltr; unicode-bidi: embed;}
-        .ltr             { direction:    ltr; unicode-bidi: embed;}
+        pre               { text-align:     left;
+                            direction:      ltr; }
+        code              { direction:      ltr;
+                            unicode-bidi:   embed; }
+        .ltr              { direction:      ltr;
+                            unicode-bidi:   embed; }
         ') }
     }