[livejournal] r18997: LJSUP-8445: S2 160x600

U   trunk/bin/upgrading/s2layers/sturdygesture/layout.s2
U   trunk/bin/upgrading/s2layers/tabularindent/layout.s2
U   trunk/bin/upgrading/s2layers/variableflow/layout.s2

Modified: trunk/bin/upgrading/s2layers/sturdygesture/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sturdygesture/layout.s2	2011-04-27 10:30:00 UTC (rev 18996)
+++ trunk/bin/upgrading/s2layers/sturdygesture/layout.s2	2011-04-27 11:04:04 UTC (rev 18997)
@@ -466,16 +466,17 @@
 
     if (viewer_sees_vbox()) {
         """<div class="box" align="center" style="padding: 0.5em 0;">""";
+        """<div class="box-vertical1">""";
         $this->print_vbox();
+        """</div>""";
+        if (viewer_sees_ad_box("s2.vertical.2")) {
+            """<div class="box-vertical2" style="margin-top: 10px;">""";
+            $this->print_ad_box("s2.vertical.2");
+            """</div>""";
+        }
         "</div>";
     }
 
-    if (viewer_sees_ad_box("s2.vertical.2")) {
-        """<div class="box box-vertical2" style="padding: 0.5em;text-align:center;">""";
-        $p->print_ad_box("s2.vertical.2");
-        """</div>""";
-    }
-
     "</td>";
 }
 

Modified: trunk/bin/upgrading/s2layers/tabularindent/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2011-04-27 10:30:00 UTC (rev 18996)
+++ trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2011-04-27 11:04:04 UTC (rev 18997)
@@ -487,7 +487,14 @@
     if (viewer_sees_vbox()) {
         "</td>";
         "<td valign=\"top\" align=\"center\" width=\"20%\">";
+        """<div class="box-vertical1">""";
         $this->print_vbox();
+        """</div>""";
+        if (viewer_sees_ad_box("s2.vertical.2")) {
+            """<div class="box-vertical2" style="margin-top: 10px;">""";
+            $this->print_ad_box("s2.vertical.2");
+            """</div>""";
+        }
         "</td></tr></table>\n";
     }
     if (viewer_sees_hbox_bottom()) {

Modified: trunk/bin/upgrading/s2layers/variableflow/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/variableflow/layout.s2	2011-04-27 10:30:00 UTC (rev 18996)
+++ trunk/bin/upgrading/s2layers/variableflow/layout.s2	2011-04-27 11:04:04 UTC (rev 18997)
@@ -388,8 +388,14 @@
 }
 if (viewer_sees_vbox()) {
     "<div style='float: right; margin-right: 10px; position: relative; z-index: 15;'>";
+    """<div class="box-vertical1">""";
     $this->print_vbox();
-    "</div>";
+    """</div>""";
+    if (viewer_sees_ad_box("s2.vertical.2")) {
+        """<div class="box-vertical2" style="margin-top: 10px;">""";
+        $this->print_ad_box("s2.vertical.2");
+        """</div>""";
+    }    "</div>";
 }
 """
 <div id="page">
@@ -1154,7 +1160,7 @@
 """; css_rule_if_length("max-width", $*adv_entry_max_width);
 """  margin-left: auto;
   margin-right: auto;
-  clear: both;
+  clear: left;
 }
 #commentform table, #commentform textarea {
 width: 100%;