[dw-nonfree] Sunday Morning: implement one-column and two-columns-right layout

[kareila]

[commit: http://hg.dwscoalition.org/dw-nonfree/rev/2aedb0c35878]

http://bugs.dwscoalition.org/show_bug.cgi?id=2636

Add support for one-column layout to Sunday Morning.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/sundaymorning/layout.s2
• cgi-bin/LJ/S2Theme/sundaymorning.pm

--------------------------------------------------------------------------------
diff -r 3eb1f9eae77d -r 2aedb0c35878 bin/upgrading/s2layers/sundaymorning/layout.s2
--- a/bin/upgrading/s2layers/sundaymorning/layout.s2	Tue Jul 20 15:05:20 2010 -0500
+++ b/bin/upgrading/s2layers/sundaymorning/layout.s2	Wed Jul 21 10:52:44 2010 -0500
@@ -371,6 +371,13 @@ q { font-style: italic;
     padding-$sidebar_position_alt: $*sidebar_width;
     padding-top: 10px;
     padding-left: 0;
+}
+
+.one-column #wrap {
+    margin-left: 2em;
+}
+
+.two-columns #wrap {
     margin-$sidebar_position: 250px;
 }
 
@@ -393,26 +400,34 @@ q { font-style: italic;
 }
 
 .module-section-two {
-    position: absolute;
-    left: 2em;
-    top: 8em;
     width: $*sidebar_width;
     max-width: 220px;
     height: 200px;
     $module_base_colors
     padding-right: 5px;
+}
+
+.two-columns .module-section-two {
+    position: absolute;
+    left: 2em;
+    top: 8em;
     margin-right: -230px;
+}
+
+.module-section-one ul {
+    $module_base_colors
+    margin: 1.5em 0 0 2em;
+    padding: .5em;
+}
+
+.two-columns .module-section-one ul {
+    margin: 1.5em 0 0 250px;
 }
 
 .module-section-one li {
     position: relative;
     display: inline;
     list-style: none;
-}
-.module-section-one ul {
-    $module_base_colors
-    margin: 1.5em 0 0 250px;
-    padding: .5em;
 }
 
 .module-section-one li a {
diff -r 3eb1f9eae77d -r 2aedb0c35878 cgi-bin/LJ/S2Theme/sundaymorning.pm
--- a/cgi-bin/LJ/S2Theme/sundaymorning.pm	Tue Jul 20 15:05:20 2010 -0500
+++ b/cgi-bin/LJ/S2Theme/sundaymorning.pm	Wed Jul 21 10:52:44 2010 -0500
@@ -1,7 +1,7 @@ package LJ::S2Theme::sundaymorning;
 package LJ::S2Theme::sundaymorning;
 use base qw( LJ::S2Theme );
 
-sub layouts { ( "2l" => "two-columns-left" ) }
+sub layouts { ( "1" => "one-column", "2l" => "two-columns-left" ) }
 sub layout_prop { "layout_type" }
 
 sub designer { "regna" }
--------------------------------------------------------------------------------