[dw-free] Bases color properties adjustment

[afuna]

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

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

Fix header background color and page subtitle colors. Most themes will
appear the same; Strawberry Sundae header background will be modified.
Preview image updated as well.

Patch by ninetydegrees. Patch by piranha.

Files modified:

• bin/upgrading/s2layers/bases/layout.s2
• bin/upgrading/s2layers/bases/themes.s2
• htdocs/img/customize/previews/bases/strawberrysundae.png

--------------------------------------------------------------------------------
diff -r f4ddb4fd60c1 -r e3c4db5cb410 bin/upgrading/s2layers/bases/layout.s2
--- a/bin/upgrading/s2layers/bases/layout.s2	Tue Oct 13 15:09:21 2009 +0000
+++ b/bin/upgrading/s2layers/bases/layout.s2	Tue Oct 13 15:50:29 2009 +0000
@@ -276,7 +276,7 @@ var string page_background = generate_ba
 var string page_background = generate_background_css ($*image_background_page_url, $*image_background_page_repeat, 
     $*image_background_page_position, $*color_page_background);
 var string header_background = generate_background_css ($*image_background_header_url, $*image_background_header_repeat, 
-    $*image_background_header_position, $*color_module_title);
+    $*image_background_header_position, $*color_header_background);
 var string entry_background = generate_background_css ($*image_background_entry_url, $*image_background_entry_repeat, 
     $*image_background_entry_position, $*color_entry_background );
 var string module_background = generate_background_css ($*image_background_module_url, $*image_background_module_repeat, 
@@ -372,7 +372,7 @@ ul ul {list-style: circle;}
 
 #title { $page_title_font font-weight: bold; padding: 2em 0 0 0.65em; color: $*color_page_title; margin: 0; }
 
-#subtitle { $page_subtitle_font padding-left: 1.5em; }
+#subtitle { $page_subtitle_font padding-left: 1.5em; color: $*color_page_title; }
 
 #header {$header_background }
 
diff -r f4ddb4fd60c1 -r e3c4db5cb410 bin/upgrading/s2layers/bases/themes.s2
--- a/bin/upgrading/s2layers/bases/themes.s2	Tue Oct 13 15:09:21 2009 +0000
+++ b/bin/upgrading/s2layers/bases/themes.s2	Tue Oct 13 15:50:29 2009 +0000
@@ -35,6 +35,27 @@ set color_module_link_active = "#ff9090"
 set color_module_link_active = "#ff9090";
 set color_module_text = "#503125";
 set color_entry_background = "#f5e4da";
+
+function Page::print_default_stylesheets()
+{
+    $this->print_default_stylesheet();
+    if ($*external_stylesheet) {
+        println safe """<link rel="stylesheet" href="$.stylesheet_url" type="text/css" />""";
+    }
+    else {
+        println """<style type="text/css">""";
+        start_css();
+        print_stylesheet();
+        end_css();
+        println """</style>""";
+    }
+
+    """<style type="text/css">
+/* ====================== HEADER ======================= */
+#header { border: none; }
+    </style>""";
+}
+
 
 #NEWLAYER: bases/sunandsand
 layerinfo type = "theme";
diff -r f4ddb4fd60c1 -r e3c4db5cb410 htdocs/img/customize/previews/bases/strawberrysundae.png
Binary file htdocs/img/customize/previews/bases/strawberrysundae.png has changed
--------------------------------------------------------------------------------