afuna: Cat under a blanket. Text: "Cats are just little people with Fur and Fangs" (Default)
afuna ([personal profile] afuna) wrote in [site community profile] changelog2009-11-19 04:37 pm
  • Add Memory
  • Share This Entry

[dw-free] Separate Negatives colors

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

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

Separate colours for Negatives header, footer and entry interaction links
for more flexibility (lets you set separate colors for these, but no visible
changes if you leave them blank ).

Patch by [personal profile] yati.

Files modified:
  • bin/upgrading/s2layers/core2.s2
  • bin/upgrading/s2layers/negatives/layout.s2
  • bin/upgrading/s2layers/negatives/themes.s2
  • cgi-bin/LJ/S2Theme.pm
--------------------------------------------------------------------------------
diff -r 140e81988438 -r a9a663f628bd bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Thu Nov 19 16:15:03 2009 +0000
+++ b/bin/upgrading/s2layers/core2.s2	Thu Nov 19 16:36:36 2009 +0000
@@ -1712,6 +1712,7 @@ property Color color_entry_title        
 property Color color_entry_title        { des = "Entry title color"; }
 property Color color_entry_title_background { des = "Entry title background color"; }
 property Color color_entry_interaction_links { des = "Color of interaction links and text"; }
+property Color color_entry_interaction_links_background { des = "Entry interaction links background color"; }
 property Color color_entry_interaction_links_hover { des = "Color of interaction links and text - hover"; }
 property Color color_entry_interaction_links_active { des = "Color of interaction links and text - active"; }
 property Color color_entry_interaction_links_visited { des = "Color of interaction links and text - visited"; }
@@ -1727,6 +1728,7 @@ set color_entry_title = "";
 set color_entry_title = "";
 set color_entry_title_background = "";
 set color_entry_interaction_links = "";
+set color_entry_interaction_links_background = "";
 set color_entry_interaction_links_hover = "";
 set color_entry_interaction_links_active = "";
 set color_entry_interaction_links_visited = "";
@@ -1762,6 +1764,10 @@ set color_page_title = "";
 set color_page_title = "";
 
 property Color color_header_background { des = "Page header background color";}
+property Color color_header_link { des = "Page header link color"; }
+property Color color_header_link_active { des = "Page header active link color"; }
+property Color color_header_link_hover { des = "Page header hover link color"; }
+property Color color_header_link_visited { des = "Page header visited link color"; }
 property Color color_footer_background { des = "Page footer background color"; }
 property Color color_footer_link { des = "Page footer link color"; }
 property Color color_footer_link_active { des = "Page footer active link color"; }
@@ -1769,6 +1775,10 @@ property Color color_footer_link_visited
 property Color color_footer_link_visited { des = "Page footer visited link color"; }
 
 set color_header_background = "";
+set color_header_link = "";
+set color_header_link_active = "";
+set color_header_link_hover = "";
+set color_header_link_visited = "";
 set color_footer_background = "";
 set color_footer_link = "";
 set color_footer_link_active = "";
diff -r 140e81988438 -r a9a663f628bd bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Thu Nov 19 16:15:03 2009 +0000
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Thu Nov 19 16:36:36 2009 +0000
@@ -36,6 +36,18 @@ propgroup colors {
     property use color_page_link_active;
     property use color_page_link_visited;
 
+    property use color_header_background;
+    property use color_header_link;
+    property use color_header_link_hover;
+    property use color_header_link_active;
+    property use color_header_link_visited;
+
+    property use color_footer_background;
+    property use color_footer_link;
+    property use color_footer_link_hover;
+    property use color_footer_link_active;
+    property use color_footer_link_visited;
+
     property use color_module_background;
     property use color_module_text;
     property use color_module_border;
@@ -54,6 +66,7 @@ propgroup colors {
     property use color_entry_text;
     property use color_entry_title;
 
+    property use color_entry_interaction_links_background;
     property use color_entry_interaction_links;
     property use color_entry_interaction_links_hover;
     property use color_entry_interaction_links_active;
@@ -67,6 +80,18 @@ set color_page_link_hover = "";
 set color_page_link_hover = "";
 set color_page_link_active = "";
 set color_page_link_visited = "";
+
+set color_header_background = "";
+set color_header_link = "";
+set color_header_link_hover = "";
+set color_header_link_active = "";
+set color_header_link_visited = "";
+
+set color_footer_background = "";
+set color_footer_link = "";
+set color_footer_link_hover = "";
+set color_footer_link_active = "";
+set color_footer_link_visited = "";
 
 set color_entry_link = "";
 set color_entry_link_hover = "";
@@ -86,6 +111,7 @@ set color_module_link_hover = "";
 set color_module_link_hover = "";
 set color_module_link_visited = "";
 
+set color_entry_interaction_links_background = "";
 set color_entry_interaction_links = "";
 set color_entry_interaction_links_hover = "";
 set color_entry_interaction_links_active = "";
@@ -240,11 +266,20 @@ set comment_management_links = "text";
 #######################
 
 ########################
+#Initialize some properties with fallback values
+function prop_init {
+    if ( not defined $*color_entry_interaction_links_background ) {
+        $*color_entry_interaction_links_background = $*color_page_background;
+    }
+}
+
+########################
 #Prints the stylesheet
 function Page::print_default_stylesheet()
 {
     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, new Color);
+    var string header_background = generate_background_css($*image_background_header_url, $*image_background_header_repeat, $*image_background_header_position, $*color_header_background);
+    var string footer_background = generate_background_css( "", "", "", $*color_footer_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, $*image_background_module_position,$*color_module_background);
     if ($*image_background_header_height > 0) {
@@ -287,6 +322,18 @@ function Page::print_default_stylesheet(
         border-bottom: 5px double $*color_module_border;
         $header_background
     }
+    #header a {
+        color: $*color_header_link;
+    }
+    #header a:active {
+        color: $*color_header_link_active;
+    }
+    #header a:visited {
+        color: $*color_header_link_visited;
+    }
+    #header a:hover {
+        color: $*color_header_link_hover;
+    }
     .module-section-two {
     }
     .module-section-three {
@@ -295,6 +342,19 @@ function Page::print_default_stylesheet(
     }
     #footer {
         clear:both;
+        $footer_background;
+    }
+    #footer a {
+        color: $*color_footer_link;
+    }
+    #footer a:active {
+        color: $*color_footer_link_active;
+    }
+    #footer a:visited {
+        color: $*color_footer_link_visited;
+    }
+    #footer a:hover {
+        color: $*color_footer_link_hover;
     }
     #primary {
         position: relative;
@@ -387,7 +447,7 @@ function Page::print_default_stylesheet(
         color: #000000;
     }
     .entry-wrapper .footer {
-        background-color: $*color_page_background;
+        background-color: $*color_entry_interaction_links_background;
     }
     .comment-poster .anonymous {
         font-weight: bold;
@@ -411,7 +471,7 @@ function Page::print_default_stylesheet(
     .entry-management-links, .entry-management-links a,
     .entry-interaction-links, .entry-interaction-links a,
     .comment-interaction-links, .comment-interaction-links a{
-        background-color: $*color_page_background;
+        background-color: $*color_entry_interaction_links_background;
         color: $*color_entry_interaction_links;
         padding: 0 0.5em;
         font-weight: normal;
diff -r 140e81988438 -r a9a663f628bd bin/upgrading/s2layers/negatives/themes.s2
--- a/bin/upgrading/s2layers/negatives/themes.s2	Thu Nov 19 16:15:03 2009 +0000
+++ b/bin/upgrading/s2layers/negatives/themes.s2	Thu Nov 19 16:36:36 2009 +0000
@@ -9,6 +9,18 @@ set color_page_link_hover = "#ffffff";
 set color_page_link_hover = "#ffffff";
 set color_page_link_active = "#666666";
 set color_page_link_visited = "#aaaaaa";
+
+set color_header_background = "#000000";
+set color_header_link = "#cccccc";
+set color_header_link_hover = "#ffffff";
+set color_header_link_active = "#666666";
+set color_header_link_visited = "#aaaaaa";
+
+set color_footer_background = "#000000";
+set color_footer_link = "#cccccc";
+set color_footer_link_hover = "#ffffff";
+set color_footer_link_active = "#666666";
+set color_footer_link_visited = "#aaaaaa";
 
 set color_entry_link = "#666666";
 set color_entry_link_hover = "#bbbbbb";
@@ -28,6 +40,7 @@ set color_module_link_hover = "#ffffff";
 set color_module_link_hover = "#ffffff";
 set color_module_link_visited = "#777777";
 
+set color_entry_interaction_links_background = "#000000";
 set color_entry_interaction_links = "#aaaaaa";
 set color_entry_interaction_links_hover = "#ffffff";
 set color_entry_interaction_links_active = "#444444";
@@ -49,6 +62,18 @@ set color_page_link_active = "#8B0000";
 set color_page_link_active = "#8B0000";
 set color_page_link_visited = "#8B0000";
 
+set color_header_background = "#dcc6b0";
+set color_header_link = "#728135";
+set color_header_link_hover = "#e39307";
+set color_header_link_active = "#8B0000";
+set color_header_link_visited = "#8B0000";
+
+set color_footer_background = "#dcc6b0";
+set color_footer_link = "#728135";
+set color_footer_link_hover = "#e39307";
+set color_footer_link_active = "#8B0000";
+set color_footer_link_visited = "#8B0000";
+
 set color_entry_text = "#646329";
 set color_entry_border = "#996633";
 set color_entry_background = "#FAFAD2";
@@ -59,6 +84,7 @@ set color_entry_link_active = "#8B0000";
 set color_entry_link_active = "#8B0000";
 set color_entry_link_visited = "#8B0000";
 
+set color_entry_interaction_links_background = "#dcc6b0";
 set color_entry_interaction_links = "#996633";
 set color_entry_interaction_links_hover = "#e39307";
 set color_entry_interaction_links_active = "#8B0000";
@@ -74,7 +100,6 @@ set color_module_link_active = "#8B0000"
 set color_module_link_active = "#8B0000";
 set color_module_link_visited = "#8B0000";
 
-
 #NEWLAYER: negatives/lightondark
 layerinfo type = "theme";
 layerinfo name = "Light On Dark";
@@ -89,6 +114,18 @@ set color_page_link_visited = "#ffffcc";
 set color_page_link_visited = "#ffffcc";
 set color_page_link_hover = "#ccffcc";
 set color_page_link_active = "#ffcccc";
+
+set color_header_background = "#666666";
+set color_header_link = "#ddddff";
+set color_header_link_visited = "#ffffcc";
+set color_header_link_hover = "#ccffcc";
+set color_header_link_active = "#ffcccc";
+
+set color_footer_background = "#666666";
+set color_footer_link = "#ddddff";
+set color_footer_link_visited = "#ffffcc";
+set color_footer_link_hover = "#ccffcc";
+set color_footer_link_active = "#ffcccc";
 
 set color_module_background = "#000000";
 set color_module_border = "#ffffff";
@@ -107,11 +144,11 @@ set color_entry_link_hover = "#ccffcc";
 set color_entry_link_hover = "#ccffcc";
 set color_entry_link_visited = "#ffffcc";
 set color_entry_link_active = "#ffcccc";
+set color_entry_interaction_links_background = "#000000";
 set color_entry_interaction_links = "#ffffff";
 set color_entry_interaction_links_visited = "#ffffcc";
 set color_entry_interaction_links_hover = "#ccffcc";
 set color_entry_interaction_links_active = "#ffcccc";
-
 
 #NEWLAYER: negatives/limecherry
 layerinfo "type" = "theme";
@@ -136,6 +173,18 @@ set color_module_text = "#103f0a";
 set color_module_text = "#103f0a";
 set color_entry_background = "#d9f3d3";
 
+set color_header_background = "#d9f3d3";
+set color_header_link = "#8f0000";
+set color_header_link_hover = "#919e89";
+set color_header_link_active = "#8f008f";
+set color_header_link_visited = "#00008F";
+
+set color_footer_background = "#d9f3d3";
+set color_footer_link = "#8f0000";
+set color_footer_link_hover = "#919e89";
+set color_footer_link_active = "#8f008f";
+set color_footer_link_visited = "#00008F";
+set color_entry_interaction_links_background = "#d9f3d3";
 set color_entry_interaction_links_hover = "#919e89";
 set color_entry_interaction_links_active = "#8F008F";
 set color_entry_interaction_links_visited = "#00008F";
@@ -163,19 +212,10 @@ set color_page_link = "#429ace";
 set color_page_link = "#429ace";
 set color_page_link_hover = "#842021";
 set color_module_background = "#ffefbd";
-set include_default_stylesheet = true;
 set color_module_title = "#ef8229";
 set color_page_text = "#ffffff";
 set color_module_text = "#000000";
-
-function Page::print_theme_stylesheet () {
-"""
-
-#footer { background-color: $*color_module_background }
-
-""";
-}
-
+set color_footer_background = "#ffefbd";
 
 #NEWLAYER: negatives/pumpkinjuice
 layerinfo "type" = "theme";
@@ -201,7 +241,18 @@ set color_page_link_hover = "#78f5e8";
 set color_page_link_hover = "#78f5e8";
 set color_entry_interaction_links = "#a6e820";
 set color_module_text = "#000002";
+set color_header_background = "#fc7837";
+set color_header_link = "#fffff6";
+set color_header_link_hover = "#78f5e8";
+set color_header_link_active = "#38bbfc";
+set color_header_link_visited = "#38bbfc";
+set color_footer_background = "#fc7837";
+set color_footer_link = "#fffff6";
+set color_footer_link_hover = "#78f5e8";
+set color_footer_link_active = "#38bbfc";
+set color_footer_link_visited = "#38bbfc";
 set color_entry_background = "#f6aa79";
+set color_entry_interaction_links_background = "#fc7837";
 set color_entry_interaction_links_hover = "#78f5e8";
 set color_entry_interaction_links_active = "#38BBFC";
 set color_entry_interaction_links_visited  = "#38BBFC";
diff -r 140e81988438 -r a9a663f628bd cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm	Thu Nov 19 16:15:03 2009 +0000
+++ b/cgi-bin/LJ/S2Theme.pm	Thu Nov 19 16:36:36 2009 +0000
@@ -744,6 +744,10 @@ sub header_props {
     qw (
         text_tags_page_header
         color_header_background
+        color_header_link 
+        color_header_link_active 
+        color_header_link_hover 
+        color_header_link_visited
         font_journal_title
         font_journal_title_size
         font_journal_title_units
@@ -800,6 +804,7 @@ sub entry_props {
         color_entry_title
         color_entry_title_background
         color_entry_interaction_links
+        color_entry_interaction_links_background
         color_entry_interaction_links_hover
         color_entry_interaction_links_active
         color_entry_interaction_links_visited
--------------------------------------------------------------------------------