[dw-free] Add one-column options to official styles

[kareila]

[commit: http://hg.dwscoalition.org/dw-free/rev/9a051d2670cf]

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

Add one-column layout option to Negatives.

Patch by cesy.

Files modified:

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

--------------------------------------------------------------------------------
diff -r 7c6f82b56f02 -r 9a051d2670cf bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Tue Sep 22 07:42:56 2009 -0500
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Tue Sep 22 08:02:53 2009 -0500
@@ -298,26 +298,20 @@ function Page::print_default_stylesheet(
     }
     #primary {
         position: relative;
-        float: left;
         font-size: 0.9em;
         padding: 10px;
         padding-bottom: 5px;
         border: 0px;
         border-left:5px double $*color_module_border;
         border-right:5px double $*color_module_border;
-        left: 10%;
-        width: 70%;
         z-index: 10;
         }
     #secondary {
         position: relative;
-        float: left;
-        left: 10%;
         margin: 0px;
         padding: 10px;
         border: 0px;
         padding-bottom: 10px;
-        width: 15%;
         font-size: 0.80em;
         $module_background
         color: $*color_module_text;
@@ -511,6 +505,15 @@ function Page::print_default_stylesheet(
     
     .entry h3 { display: inline; }
 
+    .one-column #primary {float: none;}
+    .one-column #secondary {float: none;}
+    .two-columns-right #primary {float: left;}
+    .two-columns-right #secondary {float: left;}
+    .one-column #primary {left: 5%; width: 85%;}
+    .one-column #secondary {left: 5%; width: 15%;}
+    .two-columns-right #primary {left: 10%; width: 70%;}
+    .two-columns-right #secondary {left: 10%; width: 15%;}
+
     """;
     end_css();
     "</style>\n";
diff -r 7c6f82b56f02 -r 9a051d2670cf cgi-bin/LJ/S2Theme/negatives.pm
--- a/cgi-bin/LJ/S2Theme/negatives.pm	Tue Sep 22 07:42:56 2009 -0500
+++ b/cgi-bin/LJ/S2Theme/negatives.pm	Tue Sep 22 08:02:53 2009 -0500
@@ -4,7 +4,7 @@ sub cats { qw() }
 sub cats { qw() }
 sub designer { "phoenix" }
 
-sub layouts { ( "2r" => "two-columns-right" ) }
+sub layouts { ( "1" => "one-column", "2r" => "two-columns-right" ) }
 sub layout_prop { "layout_type" }
 
 package LJ::S2Theme::negatives::black;
--------------------------------------------------------------------------------