fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2010-10-21 08:35 am
  • Add Memory
  • Share This Entry

[dw-free] multiple layouts hardcode time font color

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

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

New property for page details.

Patch by [personal profile] kareila.

Files modified:
  • bin/upgrading/s2layers/basicboxes/layout.s2
  • bin/upgrading/s2layers/boxesandborders/layout.s2
  • bin/upgrading/s2layers/colorside/layout.s2
  • bin/upgrading/s2layers/core2.s2
  • bin/upgrading/s2layers/fluidmeasure/layout.s2
  • bin/upgrading/s2layers/modish/layout.s2
  • bin/upgrading/s2layers/skittlishdreams/layout.s2
  • bin/upgrading/s2layers/steppingstones/layout.s2
  • bin/upgrading/s2layers/tranquilityiii/layout.s2
  • cgi-bin/LJ/S2Theme.pm
  • cgi-bin/LJ/S2Theme/skittlishdreams.pm
--------------------------------------------------------------------------------
diff -r bc696fb40708 -r f6c34adec046 bin/upgrading/s2layers/basicboxes/layout.s2
--- a/bin/upgrading/s2layers/basicboxes/layout.s2	Thu Oct 21 16:32:30 2010 +0800
+++ b/bin/upgrading/s2layers/basicboxes/layout.s2	Thu Oct 21 16:35:14 2010 +0800
@@ -7,6 +7,13 @@ set layout_type = "three-columns-sides";
 set layout_type = "three-columns-sides";
 set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
 set userpics_position = "right";
+
+propgroup colors_child {
+
+    property use color_page_details_text;
+}
+
+set color_page_details_text = "#999";
 
 ##===============================
 ## Navigation Module
@@ -239,7 +246,7 @@ border: none; }
 
 .entry .datetime { font-size: small;
     padding: 0 5px;
-    color: #999; }
+    color: $*color_page_details_text; }
 
 .entry .poster { display: block;
 margin: .5em 0; }
@@ -300,7 +307,7 @@ ul.entry-interaction-links { text-align:
 #primary .partial .comment .comment-title a:visited { color: $*color_entry_link; }
 
 .comment .poster-ip { font-size: small;
-    color: #999999; }
+    color: $*color_page_details_text; }
 
 .comment-content { margin-top: 1em; }
 
@@ -340,7 +347,7 @@ div.month { margin: 0 0 2em 0; }
 div.month { margin: 0 0 2em 0; }
 
 table.month td,
-table.month th { border-color: #999999;
+table.month th { border-color: $*color_page_details_text;
     vertical-align: top; }
 
 .month caption { display: none; }
diff -r bc696fb40708 -r f6c34adec046 bin/upgrading/s2layers/boxesandborders/layout.s2
--- a/bin/upgrading/s2layers/boxesandborders/layout.s2	Thu Oct 21 16:32:30 2010 +0800
+++ b/bin/upgrading/s2layers/boxesandborders/layout.s2	Thu Oct 21 16:35:14 2010 +0800
@@ -28,11 +28,14 @@ propgroup colors_child {
     property Color color_calendar_module_hasday_background {
         des = "Calendar module background color on days with entries";
     }
+
+    property use color_page_details_text;
 }
 
 set color_navigation_module_background = "";
 set color_calendar_module_emptyday_background = "";
 set color_calendar_module_hasday_background = "";
+set color_page_details_text = "#999";
 
 ##===============================
 ## Navigation Module
@@ -292,7 +295,7 @@ text-decoration: none }
 
 .entry .datetime { font-size: small;
    padding: 0 5px;
-   color: #999; }
+   color: $*color_page_details_text; }
 
 .entry .poster { display: block;
 margin: .5em 0; }
@@ -349,7 +352,7 @@ ul.entry-interaction-links { text-align:
    }
 
 .comment .poster-ip { font-size: small;
-   color: #999999; }
+   color: $*color_page_details_text; }
 
 .comment-content { margin-top: 1em; }
 
diff -r bc696fb40708 -r f6c34adec046 bin/upgrading/s2layers/colorside/layout.s2
--- a/bin/upgrading/s2layers/colorside/layout.s2	Thu Oct 21 16:32:30 2010 +0800
+++ b/bin/upgrading/s2layers/colorside/layout.s2	Thu Oct 21 16:35:14 2010 +0800
@@ -7,6 +7,13 @@ set layout_authors = [ { "name" => "bran
 set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
 set layout_type = "two-columns-right";
 set userpics_position = "right";
+
+propgroup colors_child {
+
+    property use color_page_details_text;
+}
+
+set color_page_details_text = "#999";
 
 function print_stylesheet() {
     var string canvas_colors = generate_color_css( new Color, $*color_page_background, new Color );
@@ -207,7 +214,7 @@ ul.entry-interaction-links { text-align:
 .comment .poster { display: block; }
 .partial .poster { display: inline; }
 .comment .poster-ip { font-size: small;
-    color: #999999; }
+    color: $*color_page_details_text; }
 
 .comment .contents .userpic { position: absolute;
 top: 0; }
@@ -252,7 +259,7 @@ div.month { margin: 0 0 2em 0; }
 div.month { margin: 0 0 2em 0; }
 
 table.month td,
-table.month th { border-color: #999999;
+table.month th { border-color: $*color_page_details_text;
     vertical-align: top; }
 
 #archive-year .month H3 { font-family: $*font_entry_title; }
diff -r bc696fb40708 -r f6c34adec046 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Thu Oct 21 16:32:30 2010 +0800
+++ b/bin/upgrading/s2layers/core2.s2	Thu Oct 21 16:35:14 2010 +0800
@@ -1847,6 +1847,7 @@ property Color color_page_link_visited {
 property Color color_page_link_visited { des = "Page visited link color"; }
 property Color color_page_border { des = "Page border color"; }
 property Color color_page_title { des = "Page title color"; }
+property Color color_page_details_text { des = "Color for miscellaneous page details text"; }
 
 set color_page_background = "";
 set color_page_text = "";
@@ -1856,6 +1857,7 @@ set color_page_link_visited = "";
 set color_page_link_visited = "";
 set color_page_border = "";
 set color_page_title = "";
+set color_page_details_text = "";
 
 property Color color_header_background { des = "Page header background color";}
 property Color color_header_link { des = "Page header link color"; }
diff -r bc696fb40708 -r f6c34adec046 bin/upgrading/s2layers/fluidmeasure/layout.s2
--- a/bin/upgrading/s2layers/fluidmeasure/layout.s2	Thu Oct 21 16:32:30 2010 +0800
+++ b/bin/upgrading/s2layers/fluidmeasure/layout.s2	Thu Oct 21 16:35:14 2010 +0800
@@ -9,6 +9,13 @@ set layout_authors = [ { "name" => "bran
 set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
 set userpics_position = "right";
 set all_commentsubjects = true;
+
+propgroup colors_child {
+
+    property use color_page_details_text;
+}
+
+set color_page_details_text = "#999";
 
 function print_module_navlinks() {
     var Page p = get_page();
@@ -374,17 +381,17 @@ padding-top: 2em; } /*die in a fire, IE7
 .comment .contents {  }
 
 .comment .poster-ip { font-size: small;
-    color: #999999; }
+    color: $*color_page_details_text; }
 
 .comment-content { margin-top: 1em; }
 
 .comment .edittime { margin-top: 1em; }
-.comment-content .datetime { color: #666; }
+.comment .header .datetime { color: $*color_entry_title; }
 
 .comment .multiform-checkbox { display: block;
     text-align: right;
     font-size: small;
-    color: #666;
+    color: $*color_entry_text;
 }
 
 .comment .footer { margin: .5em 0;
@@ -434,7 +441,7 @@ div.month { margin: 1em 0 2em 0;
     -khtml-border-radius: 1em; }
 
 table.month td,
-table.month th { border-color: #999999;
+table.month th { border-color: $*color_page_details_text;
     vertical-align: top; }
 
 .month caption { display: none; }
diff -r bc696fb40708 -r f6c34adec046 bin/upgrading/s2layers/modish/layout.s2
--- a/bin/upgrading/s2layers/modish/layout.s2	Thu Oct 21 16:32:30 2010 +0800
+++ b/bin/upgrading/s2layers/modish/layout.s2	Thu Oct 21 16:35:14 2010 +0800
@@ -7,6 +7,13 @@ set layout_authors = [ { "name" => "bran
 set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
 set layout_type = "two-columns-left";
 set userpics_position = "right";
+
+propgroup colors_child {
+
+    property use color_page_details_text;
+}
+
+set color_page_details_text = "#999";
 
 function print_stylesheet() {
 
@@ -96,7 +103,7 @@ border: none; }
 
 .entry .datetime { font-size: small;
     padding: 0 5px;
-    color: #999; }
+    color: $*color_page_text; }
 
 .entry .poster { display: block;
 margin: .5em 0; }
@@ -202,7 +209,7 @@ div.month { margin: 0 0 2em 0; }
 div.month { margin: 0 0 2em 0; }
 
 table.month td,
-table.month th { border-color: #999999;
+table.month th { border-color: $*color_page_details_text;
     vertical-align: top; }
 
 .month caption { display: none; }
diff -r bc696fb40708 -r f6c34adec046 bin/upgrading/s2layers/skittlishdreams/layout.s2
--- a/bin/upgrading/s2layers/skittlishdreams/layout.s2	Thu Oct 21 16:32:30 2010 +0800
+++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2	Thu Oct 21 16:35:14 2010 +0800
@@ -54,7 +54,7 @@ propgroup colors {
     property use color_page_link_visited;
     property Color color_page_border { des = "Main border color for the page, and various elements"; }
     property use color_page_title;
-    property Color color_page_details_text { des = "Color for miscellaneous page details text"; }
+    property use color_page_details_text;
 
 
     property use color_header_background;
diff -r bc696fb40708 -r f6c34adec046 bin/upgrading/s2layers/steppingstones/layout.s2
--- a/bin/upgrading/s2layers/steppingstones/layout.s2	Thu Oct 21 16:32:30 2010 +0800
+++ b/bin/upgrading/s2layers/steppingstones/layout.s2	Thu Oct 21 16:35:14 2010 +0800
@@ -6,6 +6,13 @@ layerinfo lang = "en";
 
 set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
 set layout_type = "three-columns-left";
+
+propgroup colors_child {
+
+    property use color_page_details_text;
+}
+
+set color_page_details_text = "#999";
 
 function print_stylesheet() {
     var string entry_userpic_background = generate_background_css( "$*IMGDIR/profile_icons/user.png", "no-repeat", "center", $*color_entry_border );
@@ -183,7 +190,7 @@ ul.entry-interaction-links { text-align:
 .comment .contents { margin-top: .5em ; }
 
 .comment .poster-ip { font-size: small;
-    color: #999999; }
+    color: $*color_page_details_text; }
 
 .comment .contents .userpic { $entry_userpic_background
     height: 110px;
@@ -241,7 +248,7 @@ div.month { margin: 2em 0 2em -1em;
     padding: 1em; } /*both year and month pages */
 
 table.month td,
-table.month th { border-color: #999999;
+table.month th { border-color: $*color_page_details_text;
     vertical-align: top; }
 
 .month caption { display: none; }
diff -r bc696fb40708 -r f6c34adec046 bin/upgrading/s2layers/tranquilityiii/layout.s2
--- a/bin/upgrading/s2layers/tranquilityiii/layout.s2	Thu Oct 21 16:32:30 2010 +0800
+++ b/bin/upgrading/s2layers/tranquilityiii/layout.s2	Thu Oct 21 16:35:14 2010 +0800
@@ -8,6 +8,13 @@ set layout_type = "two-columns-left";
 set layout_type = "two-columns-left";
 set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
 set userpics_position = "right";
+
+propgroup colors_child {
+
+    property use color_page_details_text;
+}
+
+set color_page_details_text = "#999";
 
 ##===============================
 ##Text
@@ -196,7 +203,7 @@ ul.entry-interaction-links li.entry-read
    }
 
 .comment .poster-ip { font-size: small;
-    color: #999999; }
+    color: $*color_page_details_text; }
 
 .comment-content { margin-top: 1em; }
 
@@ -247,7 +254,7 @@ div.month { margin: 1em 0 2em 0;}
 div.month { margin: 1em 0 2em 0;}
 
 table.month td,
-table.month th { border-color: #999999;
+table.month th { border-color: $*color_page_details_text;
     vertical-align: top; }
 
 .month caption { display: none; }
diff -r bc696fb40708 -r f6c34adec046 cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm	Thu Oct 21 16:32:30 2010 +0800
+++ b/cgi-bin/LJ/S2Theme.pm	Thu Oct 21 16:35:14 2010 +0800
@@ -868,6 +868,7 @@ sub comment_props {
         text_comment_posted
         text_comment_reply
         text_comment_thread
+        color_comment_title
         color_comment_title_background
     )
 }
@@ -890,6 +891,7 @@ sub page_props {
         color_page_link_visited
         color_page_title
         color_page_border
+        color_page_details_text
         font_base
         font_fallback
         font_base_size
diff -r bc696fb40708 -r f6c34adec046 cgi-bin/LJ/S2Theme/skittlishdreams.pm
--- a/cgi-bin/LJ/S2Theme/skittlishdreams.pm	Thu Oct 21 16:32:30 2010 +0800
+++ b/cgi-bin/LJ/S2Theme/skittlishdreams.pm	Thu Oct 21 16:35:14 2010 +0800
@@ -6,12 +6,6 @@ sub layout_prop { "layout_type" }
 sub layout_prop { "layout_type" }
 
 sub designer { "Kaigou" }
-
-sub page_props {
-    my $self = shift;
-    my @props = qw( color_page_details_text );
-    return $self->_append_props( "page_props", @props );
-}
 
 sub entry_props {
     my $self = shift;
--------------------------------------------------------------------------------