mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-09-13 04:39 am
  • Add Memory
  • Share This Entry

[dw-free] Move the setting of color properties from layout layers to the default theme layer

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

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

Move colors from the layout to the theme, for better/easier/faster/stronger
customization opportunities.

Patch by [personal profile] afuna.

Files modified:
  • bin/upgrading/s2layers/drifting/layout.s2
  • bin/upgrading/s2layers/drifting/themes.s2
  • bin/upgrading/s2layers/negatives/layout.s2
  • bin/upgrading/s2layers/negatives/themes.s2
--------------------------------------------------------------------------------
diff -r cab380aaea55 -r 8a852af3fbac bin/upgrading/s2layers/drifting/layout.s2
--- a/bin/upgrading/s2layers/drifting/layout.s2	Sun Sep 13 04:35:39 2009 +0000
+++ b/bin/upgrading/s2layers/drifting/layout.s2	Sun Sep 13 04:39:19 2009 +0000
@@ -45,23 +45,23 @@ propgroup colors
     }
 }
 
-set color_page_background         = "#eef3fa";
-set color_page_text               = "#234163";
-set color_page_link               = "#5a799d";
-set color_page_link_visited       = "#234163";
-set color_page_link_active        = "#ff0000";
-set color_page_border             = "#5a799d";
+set color_page_background         = "";
+set color_page_text               = "";
+set color_page_link               = "";
+set color_page_link_visited       = "";
+set color_page_link_active        = "";
+set color_page_border             = "";
 
-set color_module_border           = "#5a799d";
-set color_module_title            = "#5a799d";
+set color_module_border           = "";
+set color_module_title            = "";
 
-set color_entry_border            = "#5a799d";
-set color_entry_background        = "#ffffff";
-set color_entry_title             = "#5a799d";
-set color_entry_text              = "#000000";
+set color_entry_border            = "";
+set color_entry_background        = "";
+set color_entry_title             = "";
+set color_entry_text              = "";
 
-set color_page_title              = "#ffffff";
-set color_page_subtitle           = "#5a799d";
+set color_page_title              = "";
+set color_page_subtitle           = "";
 
 
 # IMAGES
diff -r cab380aaea55 -r 8a852af3fbac bin/upgrading/s2layers/drifting/themes.s2
--- a/bin/upgrading/s2layers/drifting/themes.s2	Sun Sep 13 04:35:39 2009 +0000
+++ b/bin/upgrading/s2layers/drifting/themes.s2	Sun Sep 13 04:39:19 2009 +0000
@@ -2,9 +2,28 @@ layerinfo type = "theme";
 layerinfo type = "theme";
 layerinfo name = "Drifting Blue";
 layerinfo redist_uniq = "drifting/blue";
+
+set color_page_background         = "#eef3fa";
+set color_page_text               = "#234163";
+set color_page_link               = "#5a799d";
+set color_page_link_visited       = "#234163";
+set color_page_link_active        = "#ff0000";
+set color_page_border             = "#5a799d";
+
+set color_module_border           = "#5a799d";
+set color_module_title            = "#5a799d";
+
+set color_entry_border            = "#5a799d";
+set color_entry_background        = "#ffffff";
+set color_entry_title             = "#5a799d";
+set color_entry_text              = "#000000";
+
+set color_page_title              = "#ffffff";
+set color_page_subtitle           = "#5a799d";
 
 set image_background_header_url = "drifting/hdr_bg.jpg";
 set image_background_header_repeat = "repeat";
 set image_header_left = "drifting/hdr_left.jpg";
 set image_header_right = "drifting/hdr_right.jpg";
 set image_module_header_url = "drifting/hdr_icon.gif";
+
diff -r cab380aaea55 -r 8a852af3fbac bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Sun Sep 13 04:35:39 2009 +0000
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Sun Sep 13 04:39:19 2009 +0000
@@ -61,35 +61,35 @@ propgroup colors {
 
 }
 
-set color_page_background = "#000000";
-set color_page_text = "#ffffff";
-set color_page_link = "#cccccc";
-set color_page_link_hover = "#ffffff";
-set color_page_link_active = "#666666";
-set color_page_link_visited = "#aaaaaa";
+set color_page_background = "";
+set color_page_text = "";
+set color_page_link = "";
+set color_page_link_hover = "";
+set color_page_link_active = "";
+set color_page_link_visited = "";
 
-set color_entry_link = "#666666";
-set color_entry_link_hover = "#bbbbbb";
-set color_entry_link_active = "#ffffff";
-set color_entry_link_visited = "#000000";
-set color_entry_border = "#000000";
-set color_entry_background = "#ffffff";
-set color_entry_text = "#000000";
-set color_entry_title = "#000000";
+set color_entry_link = "";
+set color_entry_link_hover = "";
+set color_entry_link_active = "";
+set color_entry_link_visited = "";
+set color_entry_border = "";
+set color_entry_background = "";
+set color_entry_text = "";
+set color_entry_title = "";
 
-set color_module_background = "#000000";
-set color_module_text = "#cccccc";
-set color_module_border = "#aaaaaa";
-set color_module_title = "#dddddd";
-set color_module_link = "#aaaaaa";
-set color_module_link_active = "#444444";
-set color_module_link_hover = "#ffffff";
-set color_module_link_visited = "#777777";
+set color_module_background = "";
+set color_module_text = "";
+set color_module_border = "";
+set color_module_title = "";
+set color_module_link = "";
+set color_module_link_active = "";
+set color_module_link_hover = "";
+set color_module_link_visited = "";
 
-set color_entry_interaction_links = "#aaaaaa";
-set color_entry_interaction_links_hover = "#ffffff";
-set color_entry_interaction_links_active = "#444444";
-set color_entry_interaction_links_visited = "#777777";
+set color_entry_interaction_links = "";
+set color_entry_interaction_links_hover = "";
+set color_entry_interaction_links_active = "";
+set color_entry_interaction_links_visited = "";
 
 ##===============================
 ## Journal style - images
diff -r cab380aaea55 -r 8a852af3fbac bin/upgrading/s2layers/negatives/themes.s2
--- a/bin/upgrading/s2layers/negatives/themes.s2	Sun Sep 13 04:35:39 2009 +0000
+++ b/bin/upgrading/s2layers/negatives/themes.s2	Sun Sep 13 04:39:19 2009 +0000
@@ -3,6 +3,35 @@ layerinfo name = "Negatives Black";
 layerinfo name = "Negatives Black";
 layerinfo redist_uniq = "negatives/black";
 
+set color_page_background = "#000000";
+set color_page_text = "#ffffff";
+set color_page_link = "#cccccc";
+set color_page_link_hover = "#ffffff";
+set color_page_link_active = "#666666";
+set color_page_link_visited = "#aaaaaa";
+
+set color_entry_link = "#666666";
+set color_entry_link_hover = "#bbbbbb";
+set color_entry_link_active = "#ffffff";
+set color_entry_link_visited = "#000000";
+set color_entry_border = "#000000";
+set color_entry_background = "#ffffff";
+set color_entry_text = "#000000";
+set color_entry_title = "#000000";
+
+set color_module_background = "#000000";
+set color_module_text = "#cccccc";
+set color_module_border = "#aaaaaa";
+set color_module_title = "#dddddd";
+set color_module_link = "#aaaaaa";
+set color_module_link_active = "#444444";
+set color_module_link_hover = "#ffffff";
+set color_module_link_visited = "#777777";
+
+set color_entry_interaction_links = "#aaaaaa";
+set color_entry_interaction_links_hover = "#ffffff";
+set color_entry_interaction_links_active = "#444444";
+set color_entry_interaction_links_visited = "#777777";
 
 #NEWLAYER: negatives/blastedsands
 layerinfo type = "theme";
--------------------------------------------------------------------------------