kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2010-04-22 02:42 am

[dw-free] Layout: Modular

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

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

New layout, Modular, by [personal profile] branchandroot, with nine themes.

Patch and previews by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers.dat
  • bin/upgrading/s2layers/modular/layout.s2
  • bin/upgrading/s2layers/modular/themes.s2
  • cgi-bin/LJ/S2Theme.pm
  • cgi-bin/LJ/S2Theme/modular.pm
  • htdocs/img/customize/previews/modular/amberandgreen.png
  • htdocs/img/customize/previews/modular/bubblegum.png
  • htdocs/img/customize/previews/modular/coffeeandcream.png
  • htdocs/img/customize/previews/modular/distinctblue.png
  • htdocs/img/customize/previews/modular/greensummer.png
  • htdocs/img/customize/previews/modular/irisatdusk.png
  • htdocs/img/customize/previews/modular/mediterraneanpeach.png
  • htdocs/img/customize/previews/modular/olivetree.png
  • htdocs/img/customize/previews/modular/swiminthesea.png
  • htdocs/stc/modular/amberandgreen-background.png
  • htdocs/stc/modular/bubblegum-background.png
  • htdocs/stc/modular/coffeeandcream-background.png
  • htdocs/stc/modular/distinctblue-background.png
  • htdocs/stc/modular/greensummer-background.png
  • htdocs/stc/modular/irisatdusk-background.png
  • htdocs/stc/modular/mediterraneanpeach-background.png
  • htdocs/stc/modular/olivetree-background.png
  • htdocs/stc/modular/swiminthesea-background.png
--------------------------------------------------------------------------------
diff -r 2e727ae9bd14 -r efdabfbecf0c bin/upgrading/s2layers.dat
--- a/bin/upgrading/s2layers.dat	Wed Apr 21 21:26:56 2010 -0500
+++ b/bin/upgrading/s2layers.dat	Wed Apr 21 21:41:53 2010 -0500
@@ -46,6 +46,9 @@ modish/layout           layout(core2base
 modish/layout           layout(core2base/layout)    core2
 modish/themes           theme+          modish/layout
 
+modular/layout           layout(core2base/layout)    core2
+modular/themes           theme+                      modular/layout
+
 negatives/layout        layout          core2
 negatives/themes        theme+          negatives/layout
 
diff -r 2e727ae9bd14 -r efdabfbecf0c bin/upgrading/s2layers/modular/layout.s2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/upgrading/s2layers/modular/layout.s2	Wed Apr 21 21:41:53 2010 -0500
@@ -0,0 +1,423 @@
+layerinfo type = "layout";
+layerinfo name = "Modular";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "modular/layout";
+layerinfo lang = "en";
+
+set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
+ 
+##===============================
+##Layout
+##===============================
+
+set layout_type = "two-columns-left";
+
+##===============================
+## Userpic
+##===============================
+
+propgroup presentation_child {
+    property use userpics_position;
+}
+
+set userpics_position = "right";
+
+##===============================
+## Navigation Module
+##===============================
+
+    property string module_navlinks_section_override {
+       values = "none|(none)|header|Header|one|Group One|two|Group Two";
+       grouped = 1;
+       }
+
+set grouped_property_override = { "module_navlinks_section" => "module_navlinks_section_override" };
+
+set module_navlinks_section = "header";
+
+##===============================
+##Fonts
+##===============================
+
+set font_base = "Verdana, Helvetica";
+set font_fallback = "sans-serif";
+set font_journal_title = "Century Gothic, Verdana, sans-serif";
+
+
+# Give a title to the navlinks module
+function print_module_navlinks() {
+    var Page p = get_page();
+    var string title = "Navigation";
+    open_module("navlinks", "$title", "");
+    var string[] links = [];
+    foreach var string k ($p.views_order) {
+        var string css = """ class="$k" """;
+        if ($p.view == $k) { $css = """ class="current $k" """; }
+        $links[size $links] = """<a href="$p.view_url{$k}"$css>""" + lang_viewname($k) + """</a>""";
+    }
+    print_module_list($links);
+    close_module();
+}
+
+function Page::print() {
+    """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head profile="http://www.w3.org/2006/03/hcard http://purl.org/uF/hAtom/0.1/ http://gmpg.org/xfn/11">\n""";
+    $this->print_head();
+    $this->print_stylesheets();
+    $this->print_head_title();
+    """</head>""";
+    $this->print_wrapper_start();
+    $this->print_control_strip();
+    """
+    <div id="canvas">
+        <div class="inner">
+            <div id="header">
+                <div class="inner">
+                    """;
+                    $this->print_module_section("header");
+                    $this->print_global_title();
+                    $this->print_global_subtitle();
+                    $this->print_title();
+    """
+                </div><!-- end header>inner -->
+            </div><!-- end header -->
+            <div id="content">
+                <div class="inner">
+                    <div id="primary"><div class="inner">
+                        """; 
+                        $this->print_body();
+    """
+                    </div></div><!-- end primary and primary>inner -->
+                    <div id="secondary"><div class="inner">
+                        """;
+                        $this->print_module_section("one");
+    """
+                    </div></div><!--  end secondary and secondary>inner -->
+                    <div id="invisible-separator" style="float: left; width: 1px;"></div> <!-- this is a hack for IE7 + two-columns-right -->
+                    <div id="tertiary"><div class="inner">
+                        """;
+                        $this->print_module_section("two");
+    """
+                    </div></div><!-- end tertiary and tertiary>inner -->
+                    <div id="content-footer"></div>
+                </div><!-- end content>inner -->
+            </div> <!-- end content -->
+        </div> <!-- end canvas>inner --> 
+    """;
+    
+    """
+    <div id="footer">
+        <div class="inner">
+            """;
+            print safe """
+                <div class="page-top"><a href="#">$*text_page_top</a></div>
+        </div><!-- end footer>inner -->
+    </div><!-- end footer -->
+    
+    </div> <!-- end canvas -->
+    """;
+    $this->print_wrapper_end();
+    """</html>""";
+}
+
+
+function print_stylesheet () {
+
+var string userpic_css = "";
+    if ($*userpics_position == "right") {
+        $userpic_css = ".entry .userpic,
+        .comment .userpic { float: right; }";
+    }
+    else {
+        $userpic_css = ".entry .userpic,
+        .comment .userpic { float: left;
+            margin-left: 0 !important; }
+
+        .entry .header,
+        .comment .header { text-align: right; }
+        .entry-title,
+        .comment-title { text-align: left; }";
+    }
+
+var string navlinks_css = "";
+    if ($*module_navlinks_section == "header") {
+        $navlinks_css = ".module-navlinks { position: absolute; 
+                top: 1.75em; 
+                right: 2em;
+                border: none;
+                background-color: transparent;
+                }
+            .module-navlinks li { display: inline;
+                padding-left: .5em;
+                border-left: 1px solid $*color_page_title;
+                }
+            .module-navlinks ul > li:first-child { border-left: none; }
+            .module-navlinks .module-header { display: none; }
+            .module-navlinks a { color: $*color_page_title; }
+            #header { padding-top: 1.5em; }";
+    }
+    else {
+        $navlinks_css = "";
+    }
+
+"""
+
+/* Modular  */
+
+blockquote { padding: 1em 1em .5em 2em;
+    font-style: italic;  } 
+blockquote > p:first-child { margin-top: 0; }
+dl dt { font-weight: bold; }
+
+h1, h2, h3, h4,
+.comment-title { font-family: $*font_journal_title;
+    font-weight: normal;
+    padding-left: .25em;
+    padding-right: .25em;
+    }
+
+.entry-title a,
+.comment-title a { text-decoration: none; }
+
+a:hover { text-decoration: none; }
+
+#header,
+#footer,
+.navigation ul,
+.entry,
+.comment,
+.module,
+.year .month,
+#archive-month .month,
+.day .day-date,
+.bottomcomment,
+.tags-container,
+table.talkform,
+.comment-pages { border-radius: 1em;
+    -moz-border-radius: 1em;
+    -webkit-border-radius: 1em;
+    -khtml-border-radius: 1em;
+    }
+
+.entry .header,
+.comment .header,
+.module-header,
+.month .header { border-radius: 1em 1em 0 0;
+    -moz-border-radius: 1em 1em 0 0;
+    -webkit-border-radius: 1em 1em 0 0;
+    -khtml-border-radius: 1em 1em 0 0;
+    }
+
+body { margin: 0; }
+
+#canvas { position: relative;
+    margin: 1em 2%;
+    padding: 1px;
+    }
+
+/* Header-Footer */
+
+#header,
+#footer { margin: 1em;
+    border: 1px solid $*color_page_border;
+    }
+
+/* Content */
+
+.navigation ul,
+.day .day-date,
+.bottomcomment,
+.tags-container,
+table.talkform,
+.comment-pages { background-color: $*color_entry_background;
+    border: 1px solid $*color_page_border; 
+    padding: .5em;
+    }
+
+.navigation { text-align: center; }
+
+.bottomcomment { padding: 0 .25em .25em .25em;
+    margin-top: 1em;
+    }
+
+.tags-container { padding: .5em 1em; }
+
+table.talkform { padding: 1em;
+    width: 100%; 
+    }
+
+.topnav ul { margin-bottom: 1.5em; }
+
+#primary > .inner:first-child { padding: 0 .5em; }
+
+.two-columns-left #content,
+.three-columns-left #content { margin-right: .5em; }
+
+.two-columns-right #content,
+.three-columns-right #content { margin-left: .5em; }
+
+
+/* Entries */
+
+.entry { margin: 1em 0 1.5em 0; }
+
+.entry .contents,
+.comment .contents { padding: .5em 1em; }
+
+.entry .header .datetime,
+.entry .metadata,
+.entry .footer .inner { font-size: small; }
+
+.entry .header { background-color: $*color_entry_title_background;
+    padding: 1px .5em .5em .5em;
+    }
+
+.entry .header .datetime { color: $*color_entry_title; }
+.entry .header .datetime a { color: $*color_entry_title; }
+
+$userpic_css 
+
+.entry .userpic { 
+    margin: -2em 10px .5em 10px;
+    padding: 0 8px 8px 8px;
+    background-color: $*color_entry_title_background;
+    }
+
+.page-recent .entry .userpic,
+.page-day .entry .userpic { margin-top: -2.5em; }
+
+.entry-content { margin-top: 1em; }
+
+.entry .metadata { font-style: italic;
+    margin-bottom: -1.5em;
+    }
+
+.entry .footer,
+.comment .footer { padding: .5em .5em 1em .5em;
+    clear: both;
+    }
+
+.entry .tag { margin-bottom: .5em; }
+
+ul.entry-management-links,
+.comment-management-links { float: left;
+    margin-top: .5em;
+    margin-bottom: .5em;
+    }
+
+ul.entry-interaction-links,
+.comment-interaction-links { text-align: right; 
+    margin-right: .5em;
+    margin-top: .5em;
+    margin-bottom: .5em;
+    }
+
+/* Comments */
+
+.comment-pages { margin: 1em 0;
+    text-align: center;
+    }
+
+.comment-thread { margin-left: 1.5em; }
+.comment-depth-1 { margin-left: 0; }
+
+.comment { border-color: $*color_entry_border; 
+    border-width: 1px;
+    border-style: solid;
+    background-color: $*color_entry_background;
+    min-width: 12em;
+    }
+
+.comment .header { background-color: $*color_comment_title_background;
+    padding: .25em .5em;
+    }
+
+.comment-title a { color: $*color_entry_title; }
+
+.comment .userpic {
+    margin: -1.5em 10px .5em 10px;
+    padding: 0 5px 5px 5px;
+    background-color: $*color_entry_title_background;
+    }
+
+.poster-ip { font-size: small;
+    font-style: italic;
+    }
+
+.comment-content { margin-top: 1em; }
+
+.multiform-checkbox { clear: both;
+    display: block;
+    }
+
+.partial .comment { padding: .25em .5em; }
+.partial .comment-title { display: inline;
+    background-color: transparent;
+    }
+.partial .comment-title a {color: $*color_page_text; }
+
+#qrformdiv { clear: both;
+    margin: .5em; }
+
+/* Archives */
+
+.year .month,
+#archive-month .month { background-color: $*color_entry_background;
+    border: 1px solid $*color_entry_border;
+    margin-bottom: 2em;
+    }
+
+.month .contents { padding: 1em .5em 0 .5em; }
+.month .footer { padding: 0 .5em 1em .5em;
+    }
+
+.month .header { background-color: $*color_entry_title_background; 
+    color: $*color_entry_title;
+    padding: 1px .25em;
+    }
+
+table.month td,
+table.month th { vertical-align: top;
+    padding: .25em .5em;
+    }
+
+table.month caption { color: $*color_entry_background; }
+
+#archive-month .month { padding: 0 1em; }
+
+#archive-month .entry-title { font-weight: bold; }
+
+/* Sidebars */
+
+.two-columns-left #tertiary .module,
+.two-columns-right #tertiary .module { margin: 1em 1em 1em 0; }
+
+.module { margin: 0 0 1.5em 0; }
+
+.module-header { font-size: medium;
+    padding: .25em .5em;
+    margin: 0;
+    }
+.module-header a { color: $*color_module_title; }
+
+.module-content { padding: .5em; }
+
+.module-content ul,
+.module-list,
+.module-credit dl { list-style: none;
+    margin: 0; padding: 0;
+    }
+
+.module-content ul ul { margin-left: 1em; }
+
+.module-content > ul:first-child { margin-top: -.5em; }
+
+ul.userlite-interaction-links { margin-top: .5em; }
+
+.module-userprofile .module-content { text-align: center; }
+
+.module-navlinks a.current { font-weight: bold; }
+
+$navlinks_css
+
+""";
+}
diff -r 2e727ae9bd14 -r efdabfbecf0c bin/upgrading/s2layers/modular/themes.s2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/upgrading/s2layers/modular/themes.s2	Wed Apr 21 21:41:53 2010 -0500
@@ -0,0 +1,494 @@
+#NEWLAYER: modular/amberandgreen
+layerinfo type = "theme";
+layerinfo name = "Amber and Green";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "modular/amberandgreen";
+
+##===============================
+## Page Images
+##===============================
+
+set image_background_page_url = "modular/amberandgreen-background.png";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
+set color_page_text = "#4c4";
+set color_page_link = "#ec3"; 
+set color_page_link_visited = "#b90";
+set color_page_link_active = "#6cc";
+set color_page_title = "#eee";
+set color_page_border = "#444";
+set color_header_background = "#333";
+set color_footer_background = "#333";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#111";
+set color_entry_title = "#eee";
+set color_entry_title_background = "#333";
+set color_entry_border = "#444";
+
+##===============================
+## Comment Colors
+##===============================
+
+set color_comment_title_background = "#333";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#111";
+set color_module_title = "#eee";
+set color_module_title_background = "#333";
+set color_module_border = "#444";
+
+
+#NEWLAYER: modular/bubblegum
+layerinfo type = "theme";
+layerinfo name = "Bubblegum";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "modular/bubblegum";
+
+set layout_resources = [ { "name" => "Meow", "url" => "http://www.colourlovers.com/palette/164203/meow" } ];
+
+# Uses the palette "Meow" by pinkpanda0466 (http://www.colourlovers.com/palette/164203/meow)
+
+##===============================
+## Page Images
+##===============================
+
+set image_background_page_url = "modular/bubblegum-background.png";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#FFEFE7";
+set color_page_text = "#252525";
+set color_page_link = "#E6A3A3"; 
+set color_page_link_visited = "#D9B2B2";
+set color_page_link_active = "#6cc";
+set color_page_border = "#bFaFa8";
+set color_header_background = "#FFEFE7";
+set color_footer_background = "#FFEFE7";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_title = "#5F4F48";
+set color_entry_title_background = "#FFEFE7";
+set color_entry_border = "#bFaFa8";
+
+##===============================
+## Comment Colors
+##===============================
+
+set color_comment_title_background = "#FFEFE7";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#fff";
+set color_module_title = "#5F4F48";
+set color_module_title_background = "#FFEFE7";
+set color_module_border = "#bFaFa8";
+
+
+#NEWLAYER: modular/coffeeandcream
+layerinfo type = "theme";
+layerinfo name = "Coffee and Cream";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "modular/coffeeandcream";
+
+set layout_resources = [ { "name" => "Black & White Photos", "url" => "http://www.colourlovers.com/palette/912388/Black__White_Photos" } ];
+
+## Uses the palette "Black & White Photos" by ladysuean (http://www.colourlovers.com/palette/912388/Black__White_Photos)
+
+##===============================
+## Page Images
+##===============================
+
+set image_background_page_url = "modular/coffeeandcream-background.png";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#473F34";
+set color_page_text = "#282421";
+set color_page_link = "#79a3bB"; 
+set color_page_link_visited = "#406389";
+set color_page_link_active = "#c66";
+set color_page_title = "#fff";
+set color_page_border = "#282421";
+set color_header_background = "#DCCDB0";
+set color_footer_background = "#DCCDB0";
+set color_footer_link = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_title = "#fff";
+set color_entry_title_background = "#DCCDB0";
+set color_entry_border = "#282421";
+
+##===============================
+## Comment Colors
+##===============================
+
+set color_comment_title_background = "#DCCDB0";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#fff";
+set color_module_title = "#fff";
+set color_module_title_background = "#DCCDB0";
+set color_module_border = "#282421";
+
+
+#NEWLAYER: modular/distinctblue
+layerinfo type = "theme";
+layerinfo name = "Distinct Blue";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "modular/distinctblue";
+
+set layout_resources = [ { "name" => "Blue Jupiter", "url" => "http://www.colourlovers.com/palette/965705/Blue_Jupiter" } ];
+
+## Uses the palette "Blue Jupiter" by memomo (http://www.colourlovers.com/palette/965705/Blue_Jupiter)
+
+##===============================
+## Page Images
+##===============================
+
+set image_background_page_url = "modular/distinctblue-background.png";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#473F34";
+set color_page_text = "#fff";
+set color_page_link = "#C7E7F4"; 
+set color_page_link_visited = "#89B3CB";
+set color_page_link_active = "#cc6";
+set color_page_title = "#fff";
+set color_page_border = "#825C2F";
+set color_header_background = "#1F305C";
+set color_footer_background = "#1F305C";
+set color_footer_link = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#111";
+set color_entry_title = "#fff";
+set color_entry_title_background = "#1F305C";
+set color_entry_border = "#825C2F";
+
+##===============================
+## Comment Colors
+##===============================
+
+set color_comment_title_background = "#1F305C";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#111";
+set color_module_title = "#fff";
+set color_module_title_background = "#1F305C";
+set color_module_border = "#825C2F";
+
+
+#NEWLAYER: modular/greensummer
+layerinfo type = "theme";
+layerinfo name = "Green Summer";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "modular/greensummer";
+
+set layout_resources = [ { "name" => "p r o l o g u e", "url" => "http://www.colourlovers.com/palette/964086/p_r_o_l_o_g_u_e_*" } ];
+
+## Uses the palette "p r o l o g u e " by sugar! (http://www.colourlovers.com/palette/964086/p_r_o_l_o_g_u_e_*)
+
+##===============================
+## Page Images
+##===============================
+
+set image_background_page_url = "modular/greensummer-background.png";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#473F34";
+set color_page_text = "#35372D";
+set color_page_link = "#D25A2B"; 
+set color_page_link_visited = "#a22A0B";
+set color_page_link_active = "#66c";
+set color_page_title = "#fff";
+set color_page_border = "#35372D";
+set color_header_background = "#869F78";
+set color_footer_background = "#869F78";
+set color_footer_link = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_title = "#fff";
+set color_entry_title_background = "#869F78";
+set color_entry_border = "#35372D";
+
+##===============================
+## Comment Colors
+##===============================
+
+set color_comment_title_background = "#869F78";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#fff";
+set color_module_title = "#fff";
+set color_module_title_background = "#869F78";
+set color_module_border = "#35372D";
+
+
+#NEWLAYER: modular/irisatdusk
+layerinfo type = "theme";
+layerinfo name = "Iris at Dusk";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "modular/irisatdusk";
+
+set layout_resources = [ { "name" => "Plum Together", "url" => "http://www.colourlovers.com/palette/1015963/Plum_Together" } ];
+
+## Uses the palette "Plum Together" by o2bqueen (http://www.colourlovers.com/palette/1015963/Plum_Together)
+
+##===============================
+## Page Images
+##===============================
+
+set image_background_page_url = "modular/irisatdusk-background.png";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#6B586E";
+set color_page_text = "#000";
+set color_page_link = "#919e68"; 
+set color_page_link_visited = "#8b8f74";
+set color_page_link_active = "#c66";
+set color_page_title = "#fff";
+set color_page_border = "#6B586E";
+set color_header_background = "#b6a2b8";
+set color_footer_background = "#b6a2b8";
+set color_footer_link = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_title = "#fff";
+set color_entry_title_background = "#b6a2b8";
+set color_entry_border = "#6B586E";
+
+##===============================
+## Comment Colors
+##===============================
+
+set color_comment_title_background = "#b6a2b8";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#fff";
+set color_module_title = "#fff";
+set color_module_title_background = "#b6a2b8";
+set color_module_border = "#6B586E";
+
+
+#NEWLAYER: modular/mediterraneanpeach
+layerinfo type = "theme";
+layerinfo name = "Mediterranean Peach";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "modular/mediterraneanpeach";
+
+set layout_resources = [ { "name" => "Nantes", "url" => "http://www.colourlovers.com/palette/448043/nantes" } ];
+
+## Uses the palette "nantes" by mimossito (http://www.colourlovers.com/palette/448043/nantes)
+
+##===============================
+## Page Images
+##===============================
+
+set image_background_page_url = "modular/mediterraneanpeach-background.png";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#473F34";
+set color_page_text = "#2B1A1A";
+set color_page_link = "#E69B5E"; 
+set color_page_link_visited = "#EDB98E";
+set color_page_link_active = "#c66";
+set color_page_title = "#fff";
+set color_page_border = "#2B1A1A";
+set color_header_background = "#486B82";
+set color_footer_background = "#486B82";
+set color_footer_link = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_title = "#fff";
+set color_entry_title_background = "#486B82";
+set color_entry_border = "#2B1A1A";
+
+##===============================
+## Comment Colors
+##===============================
+
+set color_comment_title_background = "#486B82";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#fff";
+set color_module_title = "#fff";
+set color_module_title_background = "#486B82";
+set color_module_border = "#2B1A1A";
+
+
+#NEWLAYER: modular/olivetree
+layerinfo type = "theme";
+layerinfo name = "Olive Tree";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "modular/olivetree";
+
+set layout_resources = [ { "name" => "I'm a fat tomato", "url" => "http://www.colourlovers.com/palette/912675/Im_a_fat_tomato" } ];
+
+## Uses the palette "I'm a fat tomato" by BobWestbrook (http://www.colourlovers.com/palette/912675/Im_a_fat_tomato)
+
+##===============================
+## Page Images
+##===============================
+
+set image_background_page_url = "modular/olivetree-background.png";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#fff";
+set color_page_text = "#000";
+set color_page_link = "#b70202"; 
+set color_page_link_visited = "#910D0D";
+set color_page_link_active = "#33c";
+set color_page_title = "#fff";
+set color_page_border = "#322D0D";
+set color_header_background = "#524D2D";
+set color_footer_background = "#524D2D";
+set color_footer_link = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_title = "#fff";
+set color_entry_title_background = "#524D2D";
+set color_entry_border = "#322D0D";
+
+##===============================
+## Comment Colors
+##===============================
+
+set color_comment_title_background = "#524D2D";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#fff";
+set color_module_title = "#fff";
+set color_module_title_background = "#524D2D";
+set color_module_border = "#322D0D";
+
+
+#NEWLAYER: modular/swiminthesea
+layerinfo type = "theme";
+layerinfo name = "Swim in the Sea";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "modular/swiminthesea";
+
+set layout_resources = [ { "name" => "Tip My Hat", "url" => "http://www.colourlovers.com/palette/916462/Tip_My_Hat" } ];
+
+## Uses the palette "Tip My Hat" by Highwireart (http://www.colourlovers.com/palette/916462/Tip_My_Hat)
+
+##===============================
+## Page Images
+##===============================
+
+set image_background_page_url = "modular/swiminthesea-background.png";
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#8Da7d8";
+set color_page_text = "#000";
+set color_page_link = "#8Da7d8"; 
+set color_page_link_visited = "#A5BEE7";
+set color_page_link_active = "#6c6";
+set color_page_title = "#1E1D19";
+set color_page_border = "#b1a897";
+set color_header_background = "#EFEEE9";
+set color_footer_background = "#EFEEE9";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_title = "#1E1D19";
+set color_entry_title_background = "#EFEEE9";
+set color_entry_border = "#b1a897";
+
+##===============================
+## Comment Colors
+##===============================
+
+set color_comment_title_background = "#EFEEE9";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#fff";
+set color_module_title = "#1E1D19";
+set color_module_title_background = "#EFEEE9";
+set color_module_border = "#b1a897";
diff -r 2e727ae9bd14 -r efdabfbecf0c cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm	Wed Apr 21 21:26:56 2010 -0500
+++ b/cgi-bin/LJ/S2Theme.pm	Wed Apr 21 21:41:53 2010 -0500
@@ -58,6 +58,7 @@ sub default_theme {
         easyread => 'easyread/green',
         fluidmeasure => 'fluidmeasure/spice',
         funkycircles => 'funkycircles/darkpurple',
+        modular => 'modular/mediterraneanpeach',
         negatives => 'negatives/black',
         nouveauoleanders => 'nouveauoleanders/sienna',
         refriedtablet => 'refriedtablet/refriedclassic',
diff -r 2e727ae9bd14 -r efdabfbecf0c cgi-bin/LJ/S2Theme/modular.pm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cgi-bin/LJ/S2Theme/modular.pm	Wed Apr 21 21:41:53 2010 -0500
@@ -0,0 +1,45 @@
+package LJ::S2Theme::modular;
+use base qw( LJ::S2Theme );
+
+sub layouts { ( "1" => "one-column", "2l" => "two-columns-left", "2r" => "two-columns-right", "3" => "three-columns-sides", "3r" => "three-columns-right", "3l" => "three-columns-left" ) }
+sub layout_prop { "layout_type" }
+
+sub designer { "branchandroot" }
+
+package LJ::S2Theme::modular::amberandgreen;
+use base qw( LJ::S2Theme::modular );
+sub cats { qw ( ) }
+
+package LJ::S2Theme::modular::bubblegum;
+use base qw( LJ::S2Theme::modular );
+sub cats { qw ( ) }
+
+package LJ::S2Theme::modular::coffeeandcream;
+use base qw( LJ::S2Theme::modular );
+sub cats { qw ( ) }
+
+package LJ::S2Theme::modular::distinctblue;
+use base qw( LJ::S2Theme::modular );
+sub cats { qw ( ) }
+
+package LJ::S2Theme::modular::greensummer;
+use base qw( LJ::S2Theme::modular );
+sub cats { qw ( ) }
+
+package LJ::S2Theme::modular::irisatdusk;
+use base qw( LJ::S2Theme::modular );
+sub cats { qw ( ) }
+
+package LJ::S2Theme::modular::mediterraneanpeach;
+use base qw( LJ::S2Theme::modular );
+sub cats { qw ( base ) }
+
+package LJ::S2Theme::modular::olivetree;
+use base qw( LJ::S2Theme::modular );
+sub cats { qw ( ) }
+
+package LJ::S2Theme::modular::swiminthesea;
+use base qw( LJ::S2Theme::modular );
+sub cats { qw ( ) }
+
+1;
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/img/customize/previews/modular/amberandgreen.png
Binary file htdocs/img/customize/previews/modular/amberandgreen.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/img/customize/previews/modular/bubblegum.png
Binary file htdocs/img/customize/previews/modular/bubblegum.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/img/customize/previews/modular/coffeeandcream.png
Binary file htdocs/img/customize/previews/modular/coffeeandcream.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/img/customize/previews/modular/distinctblue.png
Binary file htdocs/img/customize/previews/modular/distinctblue.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/img/customize/previews/modular/greensummer.png
Binary file htdocs/img/customize/previews/modular/greensummer.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/img/customize/previews/modular/irisatdusk.png
Binary file htdocs/img/customize/previews/modular/irisatdusk.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/img/customize/previews/modular/mediterraneanpeach.png
Binary file htdocs/img/customize/previews/modular/mediterraneanpeach.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/img/customize/previews/modular/olivetree.png
Binary file htdocs/img/customize/previews/modular/olivetree.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/img/customize/previews/modular/swiminthesea.png
Binary file htdocs/img/customize/previews/modular/swiminthesea.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/stc/modular/amberandgreen-background.png
Binary file htdocs/stc/modular/amberandgreen-background.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/stc/modular/bubblegum-background.png
Binary file htdocs/stc/modular/bubblegum-background.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/stc/modular/coffeeandcream-background.png
Binary file htdocs/stc/modular/coffeeandcream-background.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/stc/modular/distinctblue-background.png
Binary file htdocs/stc/modular/distinctblue-background.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/stc/modular/greensummer-background.png
Binary file htdocs/stc/modular/greensummer-background.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/stc/modular/irisatdusk-background.png
Binary file htdocs/stc/modular/irisatdusk-background.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/stc/modular/mediterraneanpeach-background.png
Binary file htdocs/stc/modular/mediterraneanpeach-background.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/stc/modular/olivetree-background.png
Binary file htdocs/stc/modular/olivetree-background.png has changed
diff -r 2e727ae9bd14 -r efdabfbecf0c htdocs/stc/modular/swiminthesea-background.png
Binary file htdocs/stc/modular/swiminthesea-background.png has changed
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
No Subject Icon Selected
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org