Merge branch 'upstream' into debian/sid

1 files changed, 79 insertions, 13 deletions

diff --git a/lib/sisu/v0/css.rb b/lib/sisu/v0/css.rb
index d5a15971..927a253f 100644
--- a/lib/sisu/v0/css.rb
+++ b/lib/sisu/v0/css.rb
@@ -248,6 +248,7 @@ WOK
     }
     th, td {
       display: inline;
+      vertical-align: top;
     }
 */
   a:link {
@@ -301,7 +302,7 @@ WOK
     position: absolute;
     top: 80px;
     left: 0;
-    margin-left: 0;
+    margin-left: 1%;
     width: 20%;
   }
   #column_center {
@@ -334,7 +335,7 @@ WOK
 
   .norm, .bold {
     line-height: 150%;
-    margin-left: 1em;
+    margin-left: 0em;
     margin-right: 2em;
     margin-top: 10px;
     margin-bottom: 0px;
@@ -347,22 +348,83 @@ WOK
     font-weight: normal;
     line-height: 150%;
     text-align: justify;
-    margin-left: 1em;
+    margin-left: 0em;
     margin-right: 2em;
     text-indent: 0mm;
     margin-top: 3px;
     margin-bottom: 3px;
   }
   p.norm { }
-  p.i1 {margin-left: 2em;}
-  p.i2 {margin-left: 3em;}
-  p.i3 {margin-left: 4em;}
-  p.i4 {margin-left: 5em;}
-  p.i5 {margin-left: 6em;}
-  p.i6 {margin-left: 7em;}
-  p.i7 {margin-left: 8em;}
-  p.i8 {margin-left: 9em;}
-  p.i9 {margin-left: 10em;}
+  p.i1 {margin-left: 1em;}
+  p.i2 {margin-left: 2em;}
+  p.i3 {margin-left: 3em;}
+  p.i4 {margin-left: 4em;}
+  p.i5 {margin-left: 5em;}
+  p.i6 {margin-left: 6em;}
+  p.i7 {margin-left: 7em;}
+  p.i8 {margin-left: 8em;}
+  p.i9 {margin-left: 9em;}
+
+  p.it0 {
+    margin-left: 0em;
+    margin-top: 6px;
+    margin-bottom: 0px;
+    line-height: 100%;
+  }
+  p.it1 {
+    margin-left: 1em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    line-height: 100%;
+  }
+  p.it2 {
+    margin-left: 2em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    line-height: 100%;
+  }
+  p.it3 {
+    margin-left: 3em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    line-height: 100%;
+  }
+  p.it4 {
+    margin-left: 4em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    line-height: 100%;
+  }
+  p.it5 {
+    margin-left: 5em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    line-height: 100%;
+  }
+  p.it6 {
+    margin-left: 6em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    line-height: 100%;
+  }
+  p.it7 {
+    margin-left: 7em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    line-height: 100%;
+  }
+  p.it8 {
+    margin-left: 8em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    line-height: 100%;
+  }
+  p.it9 {
+    margin-left: 9em;
+    margin-bottom: 0px;
+    margin-top: 0px;
+    line-height: 100%;
+  }
 
   p.code {
     font-family: inconsolata, andale mono, courier new, courier, monospace;
@@ -396,6 +458,10 @@ WOK
   p.bold {
     font-weight: bold;
   }
+  p.bold_left {
+    font-weight: bold;
+    text-align: left;
+  }
   p.centerbold {
     text-align: center;
     font-weight: bold;
@@ -534,7 +600,7 @@ WOK
 
   table { }
   tr { }
-  th, td { }
+  th, td { vertical-align: top; }
 
   p.left, th.left, td.left {
     text-align: left;