[dw-free] Modular needs more heading variables set

[fu]

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

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

New properties for comment title fonts.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/core2.s2
• bin/upgrading/s2layers/core2base/layout.s2
• bin/upgrading/s2layers/modular/layout.s2
• cgi-bin/LJ/S2Theme.pm

--------------------------------------------------------------------------------
diff -r c89cce13dcc4 -r a3147b60dad8 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Fri Oct 29 16:39:24 2010 +0800
+++ b/bin/upgrading/s2layers/core2.s2	Fri Oct 29 17:19:14 2010 +0800
@@ -1617,6 +1617,23 @@ property string font_entry_title_size {
 
 property string font_entry_title_units {
     des = "Units for entry title size";
+    values = "em|em|ex|ex|%|%|pt|pt|px|px";
+}
+
+property string font_comment_title {
+    des = "Preferred font for comment titles";
+    maxlength = 25;
+    size = 15;
+    note = "For example: Arial or \"Times New Roman\". Leave blank to use the default.";
+}
+
+property string font_comment_title_size {
+    des = "Size of comment title font";
+    size = 3;
+}
+
+property string font_comment_title_units {
+    des = "Units for comment title size";
     values = "em|em|ex|ex|%|%|pt|pt|px|px";
 }
 
diff -r c89cce13dcc4 -r a3147b60dad8 bin/upgrading/s2layers/core2base/layout.s2
--- a/bin/upgrading/s2layers/core2base/layout.s2	Fri Oct 29 16:39:24 2010 +0800
+++ b/bin/upgrading/s2layers/core2base/layout.s2	Fri Oct 29 17:19:14 2010 +0800
@@ -158,6 +158,9 @@ propgroup fonts {
     property use font_entry_title;
     property use font_entry_title_size;
     property use font_entry_title_units;
+    property use font_comment_title;
+    property use font_comment_title_size;
+    property use font_comment_title_units;
     property use font_module_heading;
     property use font_module_heading_size;
     property use font_module_heading_units;
@@ -310,6 +313,7 @@ function Page::print_default_stylesheet(
     var string page_title_font = generate_font_css($*font_journal_title, $*font_base, $*font_fallback, $*font_journal_title_size, $*font_journal_title_units);
     var string page_subtitle_font = generate_font_css($*font_journal_subtitle, $*font_base, $*font_fallback, $*font_journal_subtitle_size, $*font_journal_subtitle_units);
     var string entry_title_font = generate_font_css($*font_entry_title, $*font_base, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
+    var string comment_title_font = generate_font_css($*font_comment_title, $*font_base, $*font_fallback, $*font_comment_title_size, $*font_comment_title_units);
     var string module_font = generate_font_css($*font_module_text, $*font_base, $*font_fallback, $*font_module_text_size, $*font_module_text_units);
     var string module_title_font = generate_font_css($*font_module_heading, $*font_base, $*font_fallback, $*font_module_heading_size, $*font_module_heading_units);
 
@@ -579,6 +583,7 @@ ul.entry-interaction-links li {
 
 .comment .comment-title, .comment .comment-title a {
     $comment_title_colors
+    $comment_title_font
 }
 
 .comment-title h4 {
diff -r c89cce13dcc4 -r a3147b60dad8 bin/upgrading/s2layers/modular/layout.s2
--- a/bin/upgrading/s2layers/modular/layout.s2	Fri Oct 29 16:39:24 2010 +0800
+++ b/bin/upgrading/s2layers/modular/layout.s2	Fri Oct 29 17:19:14 2010 +0800
@@ -28,7 +28,10 @@ set font_base = "Verdana, Helvetica";
 set font_base = "Verdana, Helvetica";
 set font_fallback = "sans-serif";
 set font_journal_title = "Century Gothic, Verdana, sans-serif";
-
+set font_journal_subtitle = "Century Gothic, Verdana, sans-serif";
+set font_entry_title = "Century Gothic, Verdana, sans-serif";
+set font_comment_title = "Century Gothic, Verdana, sans-serif";
+set font_module_heading = "Century Gothic, Verdana, sans-serif";
 
 # Give a title to the navlinks module
 function print_module_navlinks() {
@@ -156,7 +159,7 @@ dl dt { font-weight: bold; }
 dl dt { font-weight: bold; }
 
 h1, h2, h3, h4,
-.comment-title { font-family: $*font_journal_title;
+.comment-title {
     font-weight: normal;
     padding-left: .25em;
     padding-right: .25em;
diff -r c89cce13dcc4 -r a3147b60dad8 cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm	Fri Oct 29 16:39:24 2010 +0800
+++ b/cgi-bin/LJ/S2Theme.pm	Fri Oct 29 17:19:14 2010 +0800
@@ -1012,6 +1012,9 @@ sub comment_props {
         text_comment_thread
         color_comment_title
         color_comment_title_background
+        font_comment_title
+        font_comment_title_size
+        font_comment_title_units
     )
 }
 
--------------------------------------------------------------------------------