[ljcom] r10445: LJSUP-8445: S2 160x600

U   trunk/bin/upgrading/s2layers/3column/layout.s2

Modified: trunk/bin/upgrading/s2layers/3column/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/3column/layout.s2	2011-04-27 00:40:38 UTC (rev 10444)
+++ trunk/bin/upgrading/s2layers/3column/layout.s2	2011-04-27 03:01:22 UTC (rev 10445)
@@ -272,8 +272,6 @@
 .comment_child { margin: 0px 0px 0px 20px; }
 .minicomment {padding: 4px; border: 1px solid $*entries_border; text-align: justify; }
 .minicommentholder { border: 1px solid $*entries_border; }
-
-.box-vertical2 {padding: 10px 0 0 10px;}
 """;
 
 print_custom_control_strip_css();
@@ -1289,17 +1287,18 @@
 """;
 
 $this->print_linklist();
+
 if (viewer_sees_vbox()) {
-    """<div class="sidebox">""";
+    """<div class="sidebox box-vertical1">""";
     $this->print_vbox();
     "</div>";
 }
 
 if (viewer_sees_ad_box("s2.box.yandex")) {
-        """<div class="sidebox">""";
-        $p->print_ad_box("s2.box.yandex");
-        """</div>""";
-    }
+    """<div class="sidebox box-yandex">""";
+    $p->print_ad_box("s2.box.yandex");
+    """</div>""";
+}
 
 print safe """
 
@@ -1330,8 +1329,8 @@
 
 """;
 $this->lay_print_calendar();
-if (viewer_sees_ad_box("s2.vertical.2")) {
-    """<div class="box-vertical2">""";
+if (viewer_sees_vbox() and viewer_sees_ad_box("s2.vertical.2")) {
+    """<div class="sidebox box-vertical2">""";
     $p->print_ad_box("s2.vertical.2");
     """</div>""";
 }