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-07-27 12:10 am
  • Add Memory
  • Share This Entry

[dw-free] Need header/footer background color props

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

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

Add more color properties for headers and page footer.

Patch by [personal profile] afuna.

Files modified:
  • bin/upgrading/s2layers/core2.s2
  • bin/upgrading/s2layers/core2base/layout.s2
  • cgi-bin/LJ/S2Theme.pm
--------------------------------------------------------------------------------
diff -r 089a5ee6b03d -r 96d4968b87d9 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Sun Jul 26 23:49:39 2009 +0000
+++ b/bin/upgrading/s2layers/core2.s2	Mon Jul 27 00:10:00 2009 +0000
@@ -1595,6 +1595,7 @@ property Color color_entry_link_visited 
 property Color color_entry_link_visited { des = "Entry visited link color"; }
 property Color color_entry_border       { des = "Entry border color"; }
 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"; }
 
 set color_entry_background = "";
@@ -1605,7 +1606,16 @@ set color_entry_link_visited = "";
 set color_entry_link_visited = "";
 set color_entry_border = "";
 set color_entry_title = "";
+set color_entry_title_background = "";
 set color_entry_interaction_links = "";
+
+##===============================
+## Journal style - element colors
+##===============================
+
+property Color color_comment_title_background { des = "Comment title background color"; }
+
+set color_comment_title_background = "";
 
 ##===============================
 ## Journal style - element colors
@@ -1629,6 +1639,20 @@ set color_page_border = "";
 set color_page_border = "";
 set color_page_title = "";
 
+property Color color_header_background { des = "Page header background 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"; }
+property Color color_footer_link_hover { des = "Page footer hover link color"; }
+property Color color_footer_link_visited { des = "Page footer visited link color"; }
+
+set color_header_background = "";
+set color_footer_background = "";
+set color_footer_link = "";
+set color_footer_link_active = "";
+set color_footer_link_hover = "";
+set color_footer_link_visited = "";
+
 property Color color_module_background { des = "Module background color"; }
 property Color color_module_text { des = "Module text color"; }
 property Color color_module_link { des = "Module link color"; }
@@ -1637,6 +1661,7 @@ property Color color_module_link_visited
 property Color color_module_link_visited { des = "Module visited link color"; }
 property Color color_module_border { des = "Module border color"; }
 property Color color_module_title { des = "Module title color"; }
+property Color color_module_title_background { des = "Module title background color"; }
 
 set color_module_background = "";
 set color_module_text = "";
@@ -1645,6 +1670,7 @@ set color_module_link_hover = "";
 set color_module_link_hover = "";
 set color_module_link_visited = "";
 set color_module_title = "";
+set color_module_title_background = "";
 set color_module_border = "";
 
 # Initialize custom colors, these properties can be selected or overwritten by layout layers, but should not normally be exposed in the wizard.
diff -r 089a5ee6b03d -r 96d4968b87d9 bin/upgrading/s2layers/core2base/layout.s2
--- a/bin/upgrading/s2layers/core2base/layout.s2	Sun Jul 26 23:49:39 2009 +0000
+++ b/bin/upgrading/s2layers/core2base/layout.s2	Mon Jul 27 00:10:00 2009 +0000
@@ -38,6 +38,13 @@ propgroup colors {
     property use color_page_link_visited;
     property use color_page_border;
     property use color_page_title;
+    
+    property use color_header_background;
+    property use color_footer_background;
+    property use color_footer_link;
+    property use color_footer_link_active;
+    property use color_footer_link_hover;
+    property use color_footer_link_visited;
 
     property use color_module_background;
     property use color_module_text;
@@ -47,6 +54,7 @@ propgroup colors {
     property use color_module_link_visited;
     property use color_module_border;
     property use color_module_title;
+    property use color_module_title_background;
 
     property use color_entry_background;
     property use color_entry_text;
@@ -56,7 +64,10 @@ propgroup colors {
     property use color_entry_link_visited;
     property use color_entry_border;
     property use color_entry_title;
+    property use color_entry_title_background;
     property use color_entry_interaction_links;
+    
+    property use color_comment_title_background;
 
 }
 
@@ -75,6 +86,17 @@ set color_page_title = "";
 set color_page_title = "";
 
 ##===============================
+## Header and Footer Colors
+##===============================
+
+set color_header_background = "";
+set color_footer_background = "";
+set color_footer_link = "";
+set color_footer_link_active = "";
+set color_footer_link_hover = "";
+set color_footer_link_visited = "";
+
+##===============================
 ## Entry Colors
 ##===============================
 
@@ -86,7 +108,14 @@ set color_entry_link_visited = "";
 set color_entry_link_visited = "";
 set color_entry_border = "";
 set color_entry_title = "";
+set color_entry_title_background = "";
 set color_entry_interaction_links = "";
+
+##===============================
+## Comment Colors
+##===============================
+
+set color_comment_title_background = "";
 
 ##===============================
 ## Module Colors
@@ -99,6 +128,7 @@ set color_module_link_hover = "";
 set color_module_link_hover = "";
 set color_module_link_visited = "";
 set color_module_title = "";
+set color_module_title_background = "";
 set color_module_border = "";
 
 ##===============================
@@ -190,12 +220,19 @@ propgroup text {
 
 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);
     if ($*image_background_header_height > 0) {
         $header_background = """
             $header_background
             height: """ + $*image_background_header_height + """px;""";
     }
+    
+    var string footer_background = generate_background_css( "", "", "", $*color_footer_background );
+    var string footer_link_colors = generate_color_css( $*color_footer_link, new Color, new Color );
+    var string footer_link_active_colors = generate_color_css( $*color_footer_link_active, new Color, new Color );
+    var string footer_link_hover_colors = generate_color_css( $*color_footer_link_hover, new Color, new Color );
+    var string footer_link_visited_colors = generate_color_css( $*color_footer_link_visited, new Color, new Color );
+
     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);
 
@@ -204,8 +241,9 @@ function Page::print_default_stylesheet(
     var string module_colors = generate_color_css($*color_module_text, $*color_module_background, $*color_module_border);
 
     var string page_title_colors = generate_color_css($*color_page_title, new Color, new Color);
-    var string entry_title_colors = generate_color_css($*color_entry_title, new Color, new Color);
-    var string module_title_colors = generate_color_css($*color_module_title, new Color, new Color);
+    var string entry_title_colors = generate_color_css($*color_entry_title, $*color_entry_title_background, new Color);
+    var string comment_title_colors = generate_color_css(new Color, $*color_comment_title_background, new Color);
+    var string module_title_colors = generate_color_css($*color_module_title, $*color_module_title_background, new Color);
 
     var string page_link_colors = generate_color_css($*color_page_link, new Color, new Color);
     var string page_link_active_colors = generate_color_css($*color_page_link_active, new Color, new Color);
@@ -285,6 +323,15 @@ a:visited { $page_link_visited_colors }
     $header_background
     $page_title_colors
 }
+
+#footer {
+    $footer_background
+}
+
+#footer a { $footer_link_colors }
+#footer a:active { $footer_link_active_colors }
+#footer a:hover { $footer_link_hover_colors }
+#footer a:visited { $footer_link_visited_colors }
 
 #primary {
 	float: left;
@@ -374,7 +421,7 @@ a:visited { $page_link_visited_colors }
     $entry_colors
 }
 
-.entry .entry-title h3 {
+.entry .entry-title, .entry .entry-title a {
     $entry_title_colors
 }
 
@@ -433,6 +480,10 @@ ul.entry-interaction-links li {
 
 .comment-wrapper { 
 	padding: .5em 0;
+}
+
+.comment .comment-title {
+    $comment_title_colors
 }
 
 ul.comment-management-links {
diff -r 089a5ee6b03d -r 96d4968b87d9 cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm	Sun Jul 26 23:49:39 2009 +0000
+++ b/cgi-bin/LJ/S2Theme.pm	Mon Jul 27 00:10:00 2009 +0000
@@ -698,6 +698,7 @@ sub module_props {
         color_module_link_hover
         color_module_link_visited
         color_module_title
+        color_module_title_background
     )
 }
 
@@ -718,7 +719,16 @@ sub header_props {
     qw (
         text_tags_page_header
         color_header_background
-        
+    )
+}
+
+sub footer_props {
+    qw (
+        color_footer_background
+        color_footer_link
+        color_footer_link_active
+        color_footer_link_hover
+        color_footer_link_visited
     )
 }
 
@@ -751,6 +761,7 @@ sub entry_props {
         color_entry_background
         color_entry_text
         color_entry_title
+        color_entry_title_background
         color_entry_interaction_links
     )
 }
@@ -767,7 +778,7 @@ sub comment_props {
         text_comment_posted
         text_comment_reply
         text_comment_thread
-        color_comment_bar
+        color_comment_title_background
     )
 }
 
@@ -788,9 +799,8 @@ sub page_props {
         color_page_link_hover
         color_page_link_visited
         color_page_title
+        color_page_border
     )
 }
 
-sub footer_props {}
-
 1;
--------------------------------------------------------------------------------
  • Add Memory
  • Share This Entry
(0 comments)

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
No Subject Icon Selected
More info about formatting

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

 
Notice: This account is set to log the IP addresses of everyone who comments.
Links will be displayed as unclickable URLs to help prevent spam.