kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2010-08-27 11:17 pm

[dw-free] Cleaning: make all themes.s2 files look the same

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

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

Reorder and reformat lines in theme file for Drifting.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/drifting/themes.s2
--------------------------------------------------------------------------------
diff -r 0f10219e17b8 -r 7f8bd67a8127 bin/upgrading/s2layers/drifting/themes.s2
--- a/bin/upgrading/s2layers/drifting/themes.s2	Fri Aug 27 17:41:54 2010 -0500
+++ b/bin/upgrading/s2layers/drifting/themes.s2	Fri Aug 27 18:17:10 2010 -0500
@@ -1,33 +1,48 @@
 #NEWLAYER: drifting/blue
 layerinfo type = "theme";
-layerinfo name = "Drifting Blue";
+layerinfo name = "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";
+##===============================
+## Page Colors
+##===============================
 
-set color_header_background       = "#5a799d";
+set color_page_background = "#eef3fa";
+set color_page_border = "#5a799d";
+set color_page_link = "#5a799d";
+set color_page_link_active = "#f00";
+set color_page_link_visited = "#234163";
+set color_page_subtitle = "#5a799d";
+set color_page_text = "#234163";
+set color_page_title = "#fff";
+set color_header_background = "#5a799d";
 
-set color_module_border           = "#5a799d";
-set color_module_title            = "#5a799d";
+##===============================
+## Entry Colors
+##===============================
 
-set color_entry_border            = "#5a799d";
-set color_entry_background        = "#ffffff";
-set color_entry_title             = "#5a799d";
-set color_entry_text              = "#000000";
+set color_entry_background = "#fff";
+set color_entry_border = "#5a799d";
+set color_entry_text = "#000";
+set color_entry_title = "#5a799d";
 
-set color_page_title              = "#ffffff";
-set color_page_subtitle           = "#5a799d";
+##===============================
+## Module Colors
+##===============================
 
+set color_module_border = "#5a799d";
+set color_module_title = "#5a799d";
+
+##===============================
+## Images
+##===============================
+
+set image_background_header_repeat = "repeat";
 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";
+
 
 #NEWLAYER: drifting/chocolatecherry
 layerinfo type = "theme";
@@ -37,21 +52,36 @@ layerinfo author_name = "zvi";
 
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#80404f";
+set color_page_border = "#ffe6eb";
+set color_page_link = "#ff80eb";
+set color_page_link_active = "#ff5600";
+set color_page_link_visited = "#ff809d";
+set color_page_subtitle = "#4D0040";
+set color_page_text = "#ffe6eb";
+set color_page_title = "#804075";
+set color_header_background = "#000";
+
+##===============================
+## Entry Colors
+##===============================
+
 set color_entry_background = "#4d0012";
 set color_entry_border = "#80404f";
 set color_entry_text = "#ffe6eb";
 set color_entry_title = "#ff80eb";
+
+##===============================
+## Module Colors
+##===============================
+
 set color_module_border = "#ffe6eb";
-set color_header_background = "#000000";
-set color_module_title = "#000000";
-set color_page_background = "#80404f";
-set color_page_border = "#ffe6eb";
-set color_page_link_active = "#ff5600";
-set color_page_link = "#ff80eb";
-set color_page_link_visited = "#ff809d";
-set color_page_subtitle = "#4D0040";
-set color_page_text = "#ffe6eb";
-set color_page_title = "#804075";
+set color_module_title = "#000";
+
 
 #NEWLAYER: drifting/comfortzone
 layerinfo type = "theme";
@@ -61,22 +91,37 @@ layerinfo author_name = "timeasmymeasure
 
 set layout_authors = [ { "name" => "timeasmymeasure", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#d9cba3";
+set color_page_border = "#5897a6";
+set color_page_link = "#972648";
+set color_page_link_active = "#972648";
+set color_page_link_hover = "#5897a6";
+set color_page_link_visited = "#972648";
+set color_page_subtitle = "#452b22";
+set color_page_text = "#422820";
+set color_page_title = "#972648";
+set color_header_background = "#f2f0ce";
+
+##===============================
+## Entry Colors
+##===============================
+
 set color_entry_background = "#f2f0ce";
 set color_entry_border = "#5897a6";
 set color_entry_text = "#452b22";
 set color_entry_title = "#972648";
-set color_header_background = "#f2f0ce";
+
+##===============================
+## Module Colors
+##===============================
+
 set color_module_border = "#5897a6";
 set color_module_title = "#972648";
-set color_page_background = "#d9cba3";
-set color_page_border = "#5897a6";
-set color_page_link = "#972648";
-set color_page_link_hover = "#5897a6";
-set color_page_link_active = "#972648";
-set color_page_link_visited = "#972648";
-set color_page_subtitle = "#452b22";
-set color_page_text = "#422820";
-set color_page_title = "#972648";
+
 
 #NEWLAYER: drifting/desertme
 layerinfo type = "theme";
@@ -86,13 +131,10 @@ layerinfo author_name = "timeasmymeasure
 
 set layout_authors = [ { "name" => "timeasmymeasure", "type" => "user" } ];
 
-set color_entry_background = "#ffedb8";
-set color_entry_border = "#fae4a2";
-set color_entry_text = "#785E47";
-set color_entry_title = "#785E47";
-set color_header_background = "#ffedb8";
-set color_module_border = "#fae4a2";
-set color_module_title = "#785E47";
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#fae4a2";
 set color_page_border = "#ffedb8";
 set color_page_link = "#008885";
@@ -102,20 +144,40 @@ set color_page_subtitle = "#008885";
 set color_page_subtitle = "#008885";
 set color_page_text = "#785E47";
 set color_page_title = "#785E47";
-set font_base = "tahoma, arial";
+set color_header_background = "#ffedb8";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#ffedb8";
+set color_entry_border = "#fae4a2";
+set color_entry_text = "#785E47";
+set color_entry_title = "#785E47";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_border = "#fae4a2";
+set color_module_title = "#785E47";
+
+##===============================
+## Fonts
+##===============================
+
+set font_base = "Tahoma, Arial";
 set font_base_size = "1";
 set font_base_units = "em";
 set font_entry_title = "Georgia";
 set font_entry_title_size = "1.2";
 set font_entry_title_units = "em";
-set font_journal_subtitle_units = "em";
 set font_journal_title = "Georgia";
 set font_journal_title_size = "2";
 set font_module_heading = "Georgia";
 set font_module_heading_size = "1.2";
 set font_module_heading_units = "em";
-set font_module_text_units = "em";
-set image_background_header_height = 70;
+
 
 #NEWLAYER: drifting/go
 layerinfo type = "theme";
@@ -125,50 +187,80 @@ layerinfo author_name = "zvi";
 
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#9dff80";
+set color_page_border = "#00b36e";
+set color_page_link = "#005030";
 set color_page_link_active = "#d01b52";
 set color_page_link_visited = "#6ccf1b";
-set color_page_background = "#9dff80";
-set color_page_link = "#005030";
+set color_page_subtitle = "#6ccf1b";
+set color_page_text = "#00b36e";
 set color_page_title = "#00b36e";
-set color_page_border = "#00b36e";
-set color_page_subtitle = "#6ccf1b";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_border = "#6ccf1b";
+set color_entry_text = "#00b36e";
+set color_entry_title = "#00b36e";
+
+##===============================
+## Module Colors
+##===============================
+
 set color_module_border = "#6ccf1b";
-set color_entry_text = "#00b36e";
-set color_entry_border = "#6ccf1b";
-set color_page_text = "#00b36e";
 set color_module_title = "#00b36e";
-set color_entry_title = "#00b36e";
+
 
 #NEWLAYER: drifting/idolatry
 layerinfo type = "theme";
 layerinfo name = "Idolatry";
+layerinfo redist_uniq = "drifting/idolatry";
 layerinfo author_name = "zvi";
-layerinfo redist_uniq = "drifting/idolatry";
 
 set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
 
-set color_page_link_active = "#000000";
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#470a0f";
+set color_page_border = "#45080d";
 set color_page_link = "#be8200";
+set color_page_link_active = "#000";
+set color_page_link_visited = "#f8c432";
+set color_page_subtitle = "#f8c432";
+set color_page_text = "#470a0f";
 set color_page_title = "#ffda9f";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#FFF8F0";
+set color_entry_border = "#45080d";
+set color_entry_text = "#470a0f";
+set color_entry_title = "#ffda9f";
+
+##===============================
+## Module Colors
+##===============================
+
 set color_module_border = "#45080d";
-set color_entry_text = "#470a0f";
-set color_entry_border = "#45080d";
-set color_page_text = "#470a0f";
 set color_module_title = "#be8200";
-set color_entry_title = "#ffda9f";
-set color_page_link_visited = "#f8c432";
-set color_page_border = "#45080d";
-set color_page_subtitle = "#f8c432";
-set color_entry_background = "#FFF8F0";
 
 function Page::print_theme_stylesheet() {
+    """
+    #footer {
+        color: $*color_module_title;
+        }
+    """;
+}
 
-    """
-    #footer { color: $*color_module_title ;}
-    """;
-
-}
 
 #NEWLAYER: drifting/lightondark
 layerinfo type = "theme";
@@ -178,74 +270,100 @@ layerinfo author_name = "cesy";
 
 set layout_authors = [ { "name" => "cesy", "type" => "user" } ];
 
-set color_page_link_active = "#ffcccc";
-set color_page_background = "#000000";
-set color_page_link = "#ddddff";
-set color_page_title = "#666666";
-set image_background_header_repeat = "repeat";
-set color_module_border = "#ffffff";
-set color_entry_text = "#ffffff";
-set color_entry_border = "#ffffff";
-set color_page_text = "#ffffff";
-set color_module_title = "#999999";
-set color_header_background = "#999999";
-set image_background_page_position = "top left";
-set color_entry_title = "#ffffff";
-set color_page_link_visited = "#ffffcc";
-set image_background_page_repeat = "repeat";
-set color_page_border = "#ffffff";
-set color_page_subtitle = "#666666";
-set color_entry_background = "#000000";
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#000";
+set color_page_border = "#fff";
+set color_page_link = "#ddf";
+set color_page_link_active = "#fcc";
+set color_page_link_visited = "#ffc";
+set color_page_subtitle = "#666";
+set color_page_text = "#fff";
+set color_page_title = "#666";
+set color_header_background = "#999";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#000";
+set color_entry_border = "#fff";
+set color_entry_text = "#fff";
+set color_entry_title = "#fff";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_border = "#fff";
+set color_module_title = "#999";
+
 
 #NEWLAYER: drifting/softblues
 layerinfo type = "theme";
 layerinfo name = "Soft Blues";
 layerinfo redist_uniq = "drifting/softblues";
 layerinfo author_name = "ambrya";
- 
+
 set layout_authors = [ { "name" => "ambrya", "type" => "user" } ];
 
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#a59fd7";
-set color_page_text = "#1b1551";
+set color_page_border = "#1b3f6b";
 set color_page_link = "#295d97";
 set color_page_link_visited = "#295d97";
-set color_page_border = "#1b3f6b";
+set color_page_subtitle = "#295d97";
+set color_page_text = "#1b1551";
+set color_header_background = "#a59fd7";
 
-set color_header_background = "#a59fd7";
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#928ad7";
+set color_entry_border = "#1b3f6b";
+set color_entry_title = "#2300a3";
+
+##===============================
+## Module Colors
+##===============================
 
 set color_module_border = "#1b3f6b";
 
-set color_entry_border = "#1b3f6b";
-set color_entry_background = "#928ad7";
-set color_entry_title = "#2300a3";
-
-set color_page_subtitle = "#295d97";
+##===============================
+## Images
+##===============================
 
 set image_header_right = "drifting/softblues-hdr_right.jpg";
-
 
 function Page::print_theme_stylesheet() {
     """
     #header h1#title {
         margin-left: 10px;
-    }
+        }
 
     #header h2#subtitle {
         margin-left: 110px;
-    }
+        }
 
     #header,
     .header-right {
         height: 5.813em;
-    }
+        }
 
     .header-right {
         background-position: top right;
         background-repeat: no-repeat;
         width: 250px;
-    }
+        }
     """;
 }
+
 
 #NEWLAYER: drifting/sweetpossibilities
 layerinfo type = "theme";
@@ -255,13 +373,10 @@ layerinfo author_name = "timeasmymeasure
 
 set layout_authors = [ { "name" => "timeasmymeasure", "type" => "user" } ];
 
-set color_entry_background = "#f0d8a8";
-set color_entry_border = "#a81830";
-set color_entry_text = "#4F1450";
-set color_entry_title = "#f0d8a8";
-set color_header_background = "#f0d8a8";
-set color_module_border = "#a81830";
-set color_module_title = "#c01848";
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#581e1e";
 set color_page_border = "#a81830";
 set color_page_link = "#c01848";
@@ -270,6 +385,24 @@ set color_page_subtitle = "#4F1450";
 set color_page_subtitle = "#4F1450";
 set color_page_text = "#4F1450";
 set color_page_title = "#c01848";
+set color_header_background = "#f0d8a8";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#f0d8a8";
+set color_entry_border = "#a81830";
+set color_entry_text = "#4F1450";
+set color_entry_title = "#f0d8a8";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_border = "#a81830";
+set color_module_title = "#c01848";
+
 
 #NEWLAYER: drifting/winterclarity
 layerinfo type = "theme";
@@ -279,13 +412,10 @@ layerinfo author_name = "timeasmymeasure
 
 set layout_authors = [ { "name" => "timeasmymeasure", "type" => "user" } ];
 
-set color_entry_background = "#ffffff";
-set color_entry_border = "#a7a7a7";
-set color_entry_text = "#707070";
-set color_entry_title = "#569d71";
-set color_header_background = "#ffffff";
-set color_module_border = "#569d71";
-set color_module_title = "#569d71";
+##===============================
+## Page Colors
+##===============================
+
 set color_page_background = "#f1f1f1";
 set color_page_border = "#a7a7a7";
 set color_page_link = "#569d71";
@@ -294,13 +424,31 @@ set color_page_subtitle = "#a7a7a7";
 set color_page_subtitle = "#a7a7a7";
 set color_page_text = "#585858";
 set color_page_title = "#569d71";
-set font_base = "Trebuchet  MS, Arial";
-set font_entry_title = "Trebuchet  MS, Arial";
-set font_entry_title_units = "em";
-set font_journal_subtitle_units = "em";
+set color_header_background = "#fff";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_entry_border = "#a7a7a7";
+set color_entry_text = "#707070";
+set color_entry_title = "#569d71";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_border = "#569d71";
+set color_module_title = "#569d71";
+
+##===============================
+## Fonts
+##===============================
+
+set font_base = "Trebuchet MS, Arial";
+set font_entry_title = "Trebuchet MS, Arial";
 set font_journal_title = "Verdana";
 set font_journal_title_size = "2.5";
-set font_module_heading = "Trebuchet  MS, Arial";
-set font_module_heading_units = "em";
-set font_module_text_units = "em";
+set font_module_heading = "Trebuchet MS, Arial";
 set font_title_fallback = "sans-serif";
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

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