Add a two-columns-left layout to Brittle.
Patch by 900degrees.
diffs (113 lines):
diff -r 4b455e1f6389 -r 57da319d4ba7 bin/upgrading/s2layers/brittle/layout.s2
--- a/bin/upgrading/s2layers/brittle/layout.s2 Sun Jul 25 05:08:14 2010 -0500
+++ b/bin/upgrading/s2layers/brittle/layout.s2 Sun Jul 25 06:02:19 2010 -0500
@@ -283,6 +283,13 @@ propgroup text {
}
function Page::print_default_stylesheet() {
+
+ var string sidebar_position = "";
+ var string sidebar_position_opposite = "";
+
+ if ($*layout_type == "two-columns-right") { $sidebar_position = "right";
$sidebar_position_opposite = "left"; }
+ elseif ($*layout_type == "two-columns-left") { $sidebar_position = "left";
$sidebar_position_opposite = "right"; }
+
var string page_background = generate_background_css
($*image_background_page_url, $*image_background_page_repeat,
$*image_background_page_position, $*color_page_background);
var string entry_background = generate_background_css
($*image_background_entry_url, $*image_background_entry_repeat,
$*image_background_entry_position, $*color_entry_background);
@@ -304,27 +311,31 @@ function Page::print_default_stylesheet(
if ($*entryicons_position == "opposite") {
$entryicon_css = """
div.entry div.userpic {
- float: left;
- margin: 0 0 0 -100px;
+ float: $sidebar_position_opposite;
+ margin: 0;
+ margin-$sidebar_position_opposite: -100px;
}
div.comment div.userpic {
- float: left;
- margin: 0 0 0 -110px;
+ float: $sidebar_position_opposite;
+ margin: 0;
+ margin-$sidebar_position_opposite: -110px;
}
""";
}
elseif ($*entryicons_position == "same") {
$entryicon_css = """
div.entry div.userpic {
- float: right;
- margin: 0 -100px 0 0;
+ float: $sidebar_position;
+ margin: 0;
+ margin-$sidebar_position: -100px;
}
div.comment div.userpic {
- float: right;
- margin: 0 -110px 0 0;
+ float: $sidebar_position;
+ margin: 0;
+ margin-$sidebar_position: -110px;
}
#secondary {
- margin-left: 110px;
+ margin-$sidebar_position_opposite: 110px;
}
""";
}
@@ -350,20 +361,22 @@ q { font-style: italic; }
#canvas {
margin: 0 auto;
- padding: 5% 0 5% 15%;
+ padding: 5% 0;
+ padding-$sidebar_position_opposite: 15%;
text-align: justify;
width: 85%;
}
#primary {
- float: left;
+ float: $sidebar_position_opposite;
width: 45%;
text-align: justify;
- margin: 0 0.6em 0 0;
+ margin: 0;
+ margin-$sidebar_position: .6em;
}
#secondary {
- float: left;
+ float: $sidebar_position_opposite;
width: $*sidebar_width;
margin: 1px 0 0 0;
padding: 0 1em;
@@ -373,6 +386,7 @@ q { font-style: italic; }
#tertiary {
clear: both;
+ margin-$sidebar_position: auto;
width: 45%;
background-color: $*color_entry_background;
line-height: 125%;
@@ -393,6 +407,7 @@ q { font-style: italic; }
text-transform: lowercase;
clear: both;
margin-top: 10px;
+ margin-$sidebar_position: auto;
}
#footer a, #footer a:link, #footer a:active { $*color_footer_link; }
diff -r 4b455e1f6389 -r 57da319d4ba7 cgi-bin/LJ/S2Theme/brittle.pm
--- a/cgi-bin/LJ/S2Theme/brittle.pm Sun Jul 25 05:08:14 2010 -0500
+++ b/cgi-bin/LJ/S2Theme/brittle.pm Sun Jul 25 06:02:19 2010 -0500
@@ -1,7 +1,7 @@ package LJ::S2Theme::brittle;
package LJ::S2Theme::brittle;
use base qw( LJ::S2Theme );
-sub layouts { ( "2r" => "two-columns-right" ) }
+sub layouts { ( "2l" => "two-columns-left", "2r" => "two-columns-right" ) }
sub layout_prop { "layout_type" }
sub designer { "renoir" }
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
