fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2010-11-30 02:39 pm

[dw-free] Misc. Layouts: hard-coded font faces into the CSS

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

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

Standardize property attributes for this property.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/refriedtablet/layout.s2
  • cgi-bin/LJ/S2Theme/refriedtablet.pm
--------------------------------------------------------------------------------
diff -r 1c197e46030f -r 45e3dcb608cd bin/upgrading/s2layers/refriedtablet/layout.s2
--- a/bin/upgrading/s2layers/refriedtablet/layout.s2	Tue Nov 30 22:31:09 2010 +0800
+++ b/bin/upgrading/s2layers/refriedtablet/layout.s2	Tue Nov 30 22:39:27 2010 +0800
@@ -39,12 +39,22 @@ propgroup colors_child {
 ##===============================
 
 propgroup fonts_child {
-    property string font_view_text { des = "Preferred font for page view title";
-}
-    property string font_view_text_units { des = "Units for page view text size";
-}
-    property string font_view_text_size { des = "Size of page view text font";
-}
+    property string font_view_text {
+        des = "Preferred font for page view titles";
+        maxlength = 25;
+        size = 15;
+        note = "For example: Arial or \"Times New Roman\". Leave blank to use the default.";
+        }
+
+    property string font_view_text_size {
+        des = "Size of page view titles font";
+        size = 3;
+        }
+
+    property string font_view_text_units {
+        des = "Units for page view titles size";
+        values = "em|em|ex|ex|%|%|pt|pt|px|px";
+        }
 }
 
 set font_base = "\"NimbusRoman No9 L\", Rekha, Georgia";
diff -r 1c197e46030f -r 45e3dcb608cd cgi-bin/LJ/S2Theme/refriedtablet.pm
--- a/cgi-bin/LJ/S2Theme/refriedtablet.pm	Tue Nov 30 22:31:09 2010 +0800
+++ b/cgi-bin/LJ/S2Theme/refriedtablet.pm	Tue Nov 30 22:39:27 2010 +0800
@@ -5,4 +5,14 @@ sub layouts { ( "1" => "one-column", "2l
 sub layouts { ( "1" => "one-column", "2l" => "two-columns-left", "2r" => "two-columns-right", "3" => "three-columns-sides", "3r" => "three-columns-right", "3l" => "three-columns-left" ) }
 sub layout_prop { "layout_type" }
 
+sub header_props {
+    my $self = shift;
+    my @props = qw(
+        font_view_text
+        font_view_text_size
+        font_view_text_units
+    );
+    return $self->_append_props( "header_props", @props );
+}
+
 1;
--------------------------------------------------------------------------------