[dw-free] Separate a few colour settings in Boxes and Borders

[kareila]

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

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

New color options for module backgrounds in Boxes and Borders.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/boxesandborders/layout.s2
• bin/upgrading/s2layers/boxesandborders/themes.s2

--------------------------------------------------------------------------------
diff -r 4ada761255c9 -r ba034ebf76ca bin/upgrading/s2layers/boxesandborders/layout.s2
--- a/bin/upgrading/s2layers/boxesandborders/layout.s2	Mon Jun 28 10:48:30 2010 -0500
+++ b/bin/upgrading/s2layers/boxesandborders/layout.s2	Mon Jun 28 11:42:08 2010 -0500
@@ -14,6 +14,25 @@ propgroup presentation_child {
 }
 
 set display_header_decoration = true;
+
+propgroup colors_child {
+
+    property Color color_navigation_module_background {
+        des = "Navigation module background color when in header";
+    }
+
+    property Color color_calendar_module_emptyday_background {
+        des = "Calendar module background color on empty days";
+    }
+
+    property Color color_calendar_module_hasday_background {
+        des = "Calendar module background color on days with entries";
+    }
+}
+
+set color_navigation_module_background = "";
+set color_calendar_module_emptyday_background = "";
+set color_calendar_module_hasday_background = "";
 
 function Page::print_global_title() {
 
@@ -38,8 +57,8 @@ function print_stylesheet() {
     var string module_link_colors = generate_color_css( $*color_page_background, new Color, new Color );
     var string module_link_hover_colors = generate_color_css( $*color_page_text, $*color_page_background, new Color );
 
-    var string calendar_colors = generate_color_css( $*color_page_title, $*color_page_border, new Color );
-    var string calendar_link_colors = generate_color_css( $*color_page_background, $*color_page_title, new Color );
+    var string calendar_colors = generate_color_css( $*color_page_title, $*color_calendar_module_emptyday_background, new Color );
+    var string calendar_link_colors = generate_color_css( $*color_page_background, $*color_calendar_module_hasday_background, new Color );
 
     var string footer_colors = generate_color_css( new Color, $*color_footer_background, new Color );
     """
@@ -263,12 +282,12 @@ text-decoration: none; }
     margin: 0;
     padding: 0;
     border: none;
-    background: $*color_entry_border;
+    background: $*color_navigation_module_background;
     width: 100%; }
 
 .module-navlinks ul { margin: 0;
     padding-left: 1em;
-    background: $*color_entry_border; }
+    background: $*color_navigation_module_background; }
 
 .module-navlinks ul li { display: inline;
     padding: .25em .5em;
diff -r 4ada761255c9 -r ba034ebf76ca bin/upgrading/s2layers/boxesandborders/themes.s2
--- a/bin/upgrading/s2layers/boxesandborders/themes.s2	Mon Jun 28 10:48:30 2010 -0500
+++ b/bin/upgrading/s2layers/boxesandborders/themes.s2	Mon Jun 28 11:42:08 2010 -0500
@@ -28,7 +28,7 @@ set color_footer_link_visited = "#e2d7c9
 ##===============================
 
 set color_entry_title = "#000"; 
-set color_entry_border = "#62584F"; #nav bar
+set color_entry_border = "#62584F";
 
 ##===============================
 ## Module Colors
@@ -36,6 +36,9 @@ set color_entry_border = "#62584F"; #nav
 
 set color_module_title = "#000";
 set color_module_border = "#62584F";
+set color_calendar_module_emptyday_background = "#968D85";
+set color_calendar_module_hasday_background = "#62584F";
+set color_navigation_module_background = "#62584F";
 
 
 #NEWLAYER: boxesandborders/grass
@@ -67,8 +70,8 @@ set color_footer_link_visited = "#ffffff
 ## Entry Colors
 ##===============================
 
-set color_entry_title = "#000"; #hovered nav bar
-set color_entry_border = "#97AA84"; #nav bar
+set color_entry_title = "#000";
+set color_entry_border = "#97AA84";
 
 ##===============================
 ## Module Colors
@@ -76,6 +79,9 @@ set color_entry_border = "#97AA84"; #nav
 
 set color_module_title = "#000";
 set color_module_border = "#97AA84";
+set color_calendar_module_emptyday_background = "#AEBAA6";
+set color_calendar_module_hasday_background = "#809A62";
+set color_navigation_module_background = "#97AA84";
 
 
 #NEWLAYER: boxesandborders/gray
@@ -114,6 +120,9 @@ set color_entry_border = "#999999";
 
 set color_module_title = "#222222";
 set color_module_border = "#999999";
+set color_calendar_module_emptyday_background = "#cccccc";
+set color_calendar_module_hasday_background = "#555555";
+set color_navigation_module_background = "#999999";
 
 
 #NEWLAYER: boxesandborders/lightondark
@@ -174,14 +183,12 @@ set color_module_link_active = "#ffcccc"
 set color_module_link_active = "#ffcccc";
 set color_module_link_hover = "#ccffcc";
 set color_module_link_visited = "#ffffcc";
+set color_calendar_module_emptyday_background = "#666666";
+set color_calendar_module_hasday_background = "#ffffff";
+set color_navigation_module_background = "#666666";
 
 function Page::print_theme_stylesheet() {
     """
-    .module-navlinks ul,
-    .module-calendar td {
-        background: $*color_header_background;
-        }
-
     .module td a:hover {
         color: $*color_module_border;
         
@@ -221,6 +228,9 @@ set color_module_background = "#ffefbd";
 set color_module_background = "#ffefbd";
 set color_module_text = "#000000";
 set color_module_title = "#ef8229";
+set color_calendar_module_emptyday_background = "#842021";
+set color_calendar_module_hasday_background = "#ef8229";
+set color_navigation_module_background = "";
 
 
 #NEWLAYER: boxesandborders/onfire
@@ -261,6 +271,9 @@ set color_entry_border = "#D37843";
 
 set color_module_title = "#34302D";
 set color_module_border = "#B64533";
+set color_calendar_module_emptyday_background = "#B64533";
+set color_calendar_module_hasday_background = "#D37843";
+set color_navigation_module_background = "#D37843";
 
 
 #NEWLAYER: boxesandborders/pinkafterdark
@@ -293,7 +306,7 @@ set color_footer_link_visited = "#000";
 ##===============================
 
 set color_entry_title = "#fff"; 
-set color_entry_border = "#D29A89"; #nav bar
+set color_entry_border = "#D29A89";
 
 ##===============================
 ## Module Colors
@@ -301,6 +314,9 @@ set color_entry_border = "#D29A89"; #nav
 
 set color_module_title = "#fff";
 set color_module_border = "#D29A89";
+set color_calendar_module_emptyday_background = "#B48889";
+set color_calendar_module_hasday_background = "#D7B6AF";
+set color_navigation_module_background = "#D29A89";
 
 
 #NEWLAYER: boxesandborders/rainyday
@@ -333,7 +349,7 @@ set color_footer_link_visited = "#ffffff
 ##===============================
 
 set color_entry_title = "#000";
-set color_entry_border = "#353F4F"; #nav bar
+set color_entry_border = "#353F4F";
 
 ##===============================
 ## Module Colors
@@ -341,3 +357,6 @@ set color_entry_border = "#353F4F"; #nav
 
 set color_module_title = "#000";
 set color_module_border = "#353F4F";
+set color_calendar_module_emptyday_background = "#7C86A6";
+set color_calendar_module_hasday_background = "#353F4F";
+set color_navigation_module_background = "#353F4F";
--------------------------------------------------------------------------------