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

[dw-free] customizable font options & headers

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

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

Make font properties consistent (cleanup ordering, variable names. Expose
some font settings to the customization wizard, that weren't available to
all layouts, make font for module title apply across all positions) .
Drifting has one special property still: $*font_title_fallback (description
updated)

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/bases/layout.s2
  • bin/upgrading/s2layers/blanket/layout.s2
  • bin/upgrading/s2layers/core2base/layout.s2
  • bin/upgrading/s2layers/drifting/layout.s2
  • bin/upgrading/s2layers/easyread/layout.s2
  • bin/upgrading/s2layers/negatives/layout.s2
  • bin/upgrading/s2layers/skittlishdreams/layout.s2
--------------------------------------------------------------------------------
diff -r f062121b498e -r 1de2436f0969 bin/upgrading/s2layers/bases/layout.s2
--- a/bin/upgrading/s2layers/bases/layout.s2	Sun Apr 04 11:05:48 2010 -0700
+++ b/bin/upgrading/s2layers/bases/layout.s2	Sun Apr 04 22:57:47 2010 -0700
@@ -81,11 +81,11 @@ propgroup fonts {
     property use font_entry_title_size;
     property use font_entry_title_units;
     property use font_module_heading;
+    property use font_module_heading_size;
     property use font_module_heading_units;
-    property use font_module_heading_size;
     property use font_module_text;
+    property use font_module_text_size;
     property use font_module_text_units;
-    property use font_module_text_size;
 }
 
 ##===============================
diff -r f062121b498e -r 1de2436f0969 bin/upgrading/s2layers/blanket/layout.s2
--- a/bin/upgrading/s2layers/blanket/layout.s2	Sun Apr 04 11:05:48 2010 -0700
+++ b/bin/upgrading/s2layers/blanket/layout.s2	Sun Apr 04 22:57:47 2010 -0700
@@ -63,12 +63,21 @@ propgroup fonts {
     property use font_fallback;
     property use font_base_size;
     property use font_base_units;
+    property use font_journal_title;
     property use font_journal_title_size;
     property use font_journal_title_units;
+    property use font_journal_subtitle;
     property use font_journal_subtitle_size;
     property use font_journal_subtitle_units;
+    property use font_entry_title;
     property use font_entry_title_size;
     property use font_entry_title_units;
+    property use font_module_heading;
+    property use font_module_heading_size;
+    property use font_module_heading_units;
+    property use font_module_text;
+    property use font_module_text_size;
+    property use font_module_text_units;
 }
 
 ##===============================
@@ -212,8 +221,6 @@ set font_entry_title_units = "em";
 
 function Page::print_default_stylesheet () {
 
-var string page_fonts = generate_font_css( $*font_base, $*font_fallback, $*font_base_size, $*font_base_units );
-
 var string page_colors = generate_color_css( $*color_page_text, $*color_page_background, new Color );
 
 var string page_link_colors = generate_color_css( $*color_page_link, new Color, new Color );
@@ -224,14 +231,11 @@ var string header_colors = generate_colo
 var string header_colors = generate_color_css( new Color, $*color_header_background, new Color);
 var string journal_title_colors = generate_color_css( $*color_page_title, new Color, new Color );
 var string page_title_colors = generate_color_css( $*color_page_title->lighter(), new Color, new Color );
-var string journal_title_fonts = generate_font_css( $*font_journal_title, $*font_fallback, $*font_journal_title_size, $*font_journal_title_units );
-var string journal_subtitle_fonts = generate_font_css( $*font_journal_subtitle, $*font_fallback, $*font_journal_subtitle_size, $*font_journal_subtitle_units );
 
 var string module_colors = generate_color_css( $*color_module_text, $*color_module_background, new Color );
 var string module_title_colors = generate_color_css( $*color_module_title, $*color_module_title_background, new Color );
 
 var string entry_colors = generate_color_css( new Color, $*color_entry_background, new Color );
-var string entry_title_fonts = generate_font_css( $*font_entry_title, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units );
 var string entry_title_colors = generate_color_css( $*color_entry_title, new Color, new Color );
 var string userpic_colors = generate_color_css( new Color, $*color_entry_background, $*color_entry_border->darker() );
 
@@ -240,12 +244,20 @@ var string active_month_colors = generat
 var string active_month_colors = generate_color_css( $*color_page_link_hover->darker(), new Color, new Color );
 var string month_header_colors = generate_color_css( $*color_entry_border->darker(130), $*color_entry_border, new Color );
 
+    var string page_font = generate_font_css($*font_base, $*font_fallback, $*font_base_size, $*font_base_units);
+    var string page_title_font = generate_font_css($*font_journal_title, $*font_fallback, $*font_journal_title_size, $*font_journal_title_units);
+    var string page_subtitle_font = generate_font_css($*font_journal_subtitle, $*font_fallback, $*font_journal_subtitle_size, $*font_journal_subtitle_units);
+    var string entry_title_font = generate_font_css($*font_entry_title, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
+    var string module_font = generate_font_css($*font_module_text, $*font_fallback, $*font_module_text_size, $*font_module_text_units);
+    var string module_title_font = generate_font_css($*font_module_heading, $*font_fallback, $*font_module_heading_size, $*font_module_heading_units);
+
+
 """
 
 <style type="text/css">
 /* Blanket */
 
-body { padding: 0; margin: 0; text-align: center; $page_colors $page_fonts }
+body { padding: 0; margin: 0; text-align: center; $page_colors $page_font }
 
 a, a:active { text-decoration: none; $page_link_colors }
 a:visited { $page_link_visited_colors }
@@ -266,9 +278,9 @@ div.navigation ul { display: inline; pad
 div.navigation ul { display: inline; padding: 0; margin: 0; }
 
 /*--- header texts ---*/
-div#header h1#title { font-weight: normal; text-transform: uppercase; letter-spacing: 0; padding: 0; margin: 0; $journal_title_colors $journal_title_fonts }
-div#header h2#subtitle { font-weight: normal; text-transform: lowercase; letter-spacing: 1px; padding: 0; margin: 0; $journal_title_colors $journal_subtitle_fonts }
-div#header h2#pagetitle { font-weight: normal; text-transform: uppercase; letter-spacing: 1px; padding: 0; margin: 1em 0 0 0; $page_title_colors $journal_subtitle_fonts }
+div#header h1#title { font-weight: normal; text-transform: uppercase; letter-spacing: 0; padding: 0; margin: 0; $journal_title_colors $page_title_font }
+div#header h2#subtitle { font-weight: normal; text-transform: lowercase; letter-spacing: 1px; padding: 0; margin: 0; $journal_title_colors $page_subtitle_font }
+div#header h2#pagetitle { font-weight: normal; text-transform: uppercase; letter-spacing: 1px; padding: 0; margin: 1em 0 0 0; $page_title_colors $page_subtitle_font }
 
 /*--- navigation links ---*/
 div.module-navlinks { position: fixed; bottom: 0; z-index: 100; padding: 0.75em; width: 100%; margin: 0 auto; $module_colors }
@@ -281,11 +293,12 @@ div.module-navlinks ul.module-list li { 
 
 #secondary .module { float: left; margin: 2em 1em;}
 #secondary .module-header, #secondary .module-header a { $module_title_colors }
+#secondary .module-header { $module_title_font }
 #secondary .separator-after { clear: both; }
 .module-tags_cloud { margin: 3em 0; width: 100%; float: none; border-top: 1px solid $*color_entry_border; border-bottom: 1px solid $*color_entry_border; }
 .module-tags_cloud .module-content { padding: 0 3em 1em 3em; }
 
-#secondary .module-content { text-align: left; }
+#secondary .module-content { text-align: left; $module_font }
 #secondary .module-content ul {  list-style: outside; margin-left: 1em;  padding-left: 0; }
 #secondary .module-content li { margin: .5em 0; }
 .module-photo .module-content { text-align: center; }
@@ -301,7 +314,7 @@ div.entry-content { margin: 1em 0 0 0; }
 div.entry-content { margin: 1em 0 0 0; }
 
 div.header { padding: 0; margin: 0 0 1em 0; }
-h3.entry-title { font-weight: normal; text-transform: lowercase; letter-spacing: -1; padding: 0; margin: 0; $entry_title_fonts $entry_title_colors }
+h3.entry-title { font-weight: normal; text-transform: lowercase; letter-spacing: -1; padding: 0; margin: 0; $entry_title_font $entry_title_colors }
 h3.entry-title a { $entry_title_colors }
 
 .datetime { font-size: 0.9em; font-weight: normal; text-transform: uppercase; letter-spacing: 1px; padding: 0; $page_title_colors }
diff -r f062121b498e -r 1de2436f0969 bin/upgrading/s2layers/core2base/layout.s2
--- a/bin/upgrading/s2layers/core2base/layout.s2	Sun Apr 04 11:05:48 2010 -0700
+++ b/bin/upgrading/s2layers/core2base/layout.s2	Sun Apr 04 22:57:47 2010 -0700
@@ -150,11 +150,11 @@ propgroup fonts {
     property use font_entry_title_size;
     property use font_entry_title_units;
     property use font_module_heading;
+    property use font_module_heading_size;
     property use font_module_heading_units;
-    property use font_module_heading_size;
     property use font_module_text;
+    property use font_module_text_size;
     property use font_module_text_units;
-    property use font_module_text_size;
 }
 
 set font_base = "";
@@ -374,7 +374,8 @@ h1#title {
     $page_title_font
 }
 
-h2#subtitle {
+h2#subtitle,
+h2#pagetitle {
     $page_subtitle_font
 }
 
@@ -476,9 +477,12 @@ h2#subtitle {
     $entry_colors
 }
 
+.entry .entry-title {
+    $entry_title_font
+}
+
 .entry .entry-title, .entry .entry-title a {
     $entry_title_colors
-    $entry_title_font
 }
 
 .entry a { $entry_link_colors }
diff -r f062121b498e -r 1de2436f0969 bin/upgrading/s2layers/drifting/layout.s2
--- a/bin/upgrading/s2layers/drifting/layout.s2	Sun Apr 04 11:05:48 2010 -0700
+++ b/bin/upgrading/s2layers/drifting/layout.s2	Sun Apr 04 22:57:47 2010 -0700
@@ -132,12 +132,23 @@ propgroup fonts
     property use font_journal_title;
     property use font_journal_title_size;
     property use font_journal_title_units;
-
+    property use font_journal_subtitle;
+    property use font_journal_subtitle_size;
+    property use font_journal_subtitle_units;
     property string font_title_fallback
     {
-        des    = "Alternative font for Subjects and Title";
+        des    = "Alternative font for journal title and subtitle";
         values = "sans-serif|Sans-serif|serif|Serif|cursive|Cursive|monospace|Monospaced|none|Use browser's default";
     }
+    property use font_entry_title;
+    property use font_entry_title_size;
+    property use font_entry_title_units;
+    property use font_module_heading;
+    property use font_module_heading_size;
+    property use font_module_heading_units;
+    property use font_module_text;
+    property use font_module_text_size;
+    property use font_module_text_units;
 }
 
 set font_base         = "Arial";
@@ -145,9 +156,9 @@ set font_base_size  = "16";
 set font_base_size  = "16";
 set font_base_units = "px";
 set font_journal_title  = "Times New Roman";
-set font_title_fallback = "serif";
 set font_journal_title_size  = "2.8";
 set font_journal_title_units = "em";
+set font_title_fallback = "serif";
 
 # PRESENTATION
 ################################################################################
@@ -250,7 +261,10 @@ function Page::print_default_stylesheet(
     # Determine the font strings to use in the CSS
     var string page_font = generate_font_css($*font_base, $*font_fallback, $*font_base_size, $*font_base_units);
     var string page_title_font = generate_font_css($*font_journal_title, $*font_title_fallback, $*font_journal_title_size, $*font_journal_title_units);
-    var string page_subtitle_font = generate_font_css($*font_journal_title, $*font_title_fallback, "", "");
+    var string page_subtitle_font = generate_font_css($*font_journal_subtitle, $*font_title_fallback, $*font_journal_subtitle_size, $*font_journal_subtitle_units);
+    var string entry_title_font = generate_font_css($*font_entry_title, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
+    var string module_font = generate_font_css($*font_module_text, $*font_fallback, $*font_module_text_size, $*font_module_text_units);
+    var string module_title_font = generate_font_css($*font_module_heading, $*font_fallback, $*font_module_heading_size, $*font_module_heading_units);
 
     """<style type="text/css">""";
     start_css();
@@ -332,6 +346,15 @@ function Page::print_default_stylesheet(
         padding-left: 10px;
         font-size: 1.1em;
     }
+
+    .module h2 {
+        $module_title_font
+    }
+
+    .module-content {
+        $module_font
+    }
+
 
     /* Header
     ***************************************************************************/
@@ -584,6 +607,7 @@ function Page::print_default_stylesheet(
         display: inline;
         font-size: 1.1em;
         color: $*color_entry_title;
+        $entry_title_font
     }
 
     .entry .trust-filter {
diff -r f062121b498e -r 1de2436f0969 bin/upgrading/s2layers/easyread/layout.s2
--- a/bin/upgrading/s2layers/easyread/layout.s2	Sun Apr 04 11:05:48 2010 -0700
+++ b/bin/upgrading/s2layers/easyread/layout.s2	Sun Apr 04 22:57:47 2010 -0700
@@ -85,11 +85,11 @@ propgroup fonts {
     property use font_entry_title_size;
     property use font_entry_title_units;
     property use font_module_heading;
+    property use font_module_heading_size;
     property use font_module_heading_units;
-    property use font_module_heading_size;
     property use font_module_text;
+    property use font_module_text_size;
     property use font_module_text_units;
-    property use font_module_text_size;
 }
 set font_base = """APHont, "Helvetica Neue", Arial, Helvetica, Geneva""";
 set font_base_size = "1";
@@ -303,9 +303,14 @@ function Page::print_default_stylesheet 
     var string page_link_active_colors = generate_color_css($*color_page_link_active, new Color, new Color);
     var string page_link_hover_colors = generate_color_css($*color_page_link_hover, new Color, new Color);
     var string page_link_visited_colors = generate_color_css($*color_page_link_visited, new Color, new Color);
+
+    var string page_font = generate_font_css($*font_base, $*font_fallback, $*font_base_size, $*font_base_units);
     var string page_title_font = generate_font_css($*font_journal_title, $*font_fallback, $*font_journal_title_size, $*font_journal_title_units);
     var string page_subtitle_font = generate_font_css($*font_journal_subtitle, $*font_fallback, $*font_journal_subtitle_size, $*font_journal_subtitle_units);
-    var string page_font = generate_font_css($*font_base, $*font_fallback, $*font_base_size, $*font_base_units);
+    var string entry_title_font = generate_font_css($*font_entry_title, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
+    var string module_font = generate_font_css($*font_module_text, $*font_fallback, $*font_module_text_size, $*font_module_text_units);
+    var string module_title_font = generate_font_css($*font_module_heading, $*font_fallback, $*font_module_heading_size, $*font_module_heading_units);
+
 
 """<style type="text/css">""";
 
@@ -344,6 +349,14 @@ body {
     $page_colors
 }
 
+/* Modules */
+.module h2 {
+    $module_title_font
+}
+
+.module-content {
+    $module_font
+}
 
 /*
  * Journal Header
@@ -364,6 +377,10 @@ body {
 #header h2#subtitle {
     font-style: italic;
     margin-top: 0;
+    $page_subtitle_font
+}
+
+#header h2#pagetitle {
     $page_subtitle_font
 }
 
@@ -473,6 +490,9 @@ h2.module-header a {
     border-top: solid 2px $*color_page_border;
 }
 
+.entry .entry-title {
+    $entry_title_font
+}
 
 .entry .metadata-label {
     font-weight: bold;
diff -r f062121b498e -r 1de2436f0969 bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Sun Apr 04 11:05:48 2010 -0700
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Sun Apr 04 22:57:47 2010 -0700
@@ -126,12 +126,15 @@ propgroup fonts {
     property use font_fallback;
     property use font_base_size;
     property use font_base_units;
+    property use font_entry_title;
+    property use font_entry_title_size;
+    property use font_entry_title_units;
     property use font_module_heading;
     property use font_module_heading_units;
     property use font_module_heading_size;
-    property use font_entry_title;
-    property use font_entry_title_size;
-    property use font_entry_title_units;
+    property use font_module_text;
+    property use font_module_text_size;
+    property use font_module_text_units;
 }
 
 set font_base = "Georgia";
@@ -287,8 +290,9 @@ function Page::print_default_stylesheet(
         $header_background = $header_background + "\n        height: " + $*image_background_header_height + "px;";
     }
     var string page_font = generate_font_css($*font_base, $*font_fallback, $*font_base_size, $*font_base_units);
+    var string entry_title_font = generate_font_css($*font_entry_title, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
+    var string module_font = generate_font_css($*font_module_text, $*font_fallback, $*font_module_text_size, $*font_module_text_units);
     var string module_title_font = generate_font_css($*font_module_heading, $*font_fallback, $*font_module_heading_size, $*font_module_heading_units);
-    var string entry_title_font = generate_font_css($*font_entry_title, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
 
     """<style type="text/css">""";
     start_css();
@@ -395,7 +399,6 @@ function Page::print_default_stylesheet(
         border-bottom:1px solid $*color_module_border;
         font-weight:bold;
         letter-spacing:.3em;
-        $module_title_font
     }
     .two-columns-right #secondary .module-header {
         text-align: right;
@@ -410,6 +413,15 @@ function Page::print_default_stylesheet(
         letter-spacing:.3em;
         padding: 0.5em 0;
     }
+
+    .module h2 {
+        $module_title_font
+    }
+
+    .module-content {
+        $module_font
+    }
+
     .userpic{
         float:right;}
     .entry, .entry-wrapper, .comment, .comment-wrapper {
@@ -567,6 +579,8 @@ function Page::print_default_stylesheet(
     }
     .subject, .subject a, .subject a:visited, .subject a:hover, .subject a:active {
         font-weight:bold;
+    }
+    .subject {
         $entry_title_font
     }
     .module-section-two .module-calendar,
diff -r f062121b498e -r 1de2436f0969 bin/upgrading/s2layers/skittlishdreams/layout.s2
--- a/bin/upgrading/s2layers/skittlishdreams/layout.s2	Sun Apr 04 11:05:48 2010 -0700
+++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2	Sun Apr 04 22:57:47 2010 -0700
@@ -149,6 +149,7 @@ set image_background_header_height = 100
 set image_background_header_height = 100;
 set image_background_page_repeat = "repeat-x";
 set image_background_page_position = "top left";
+
 propgroup fonts {
     property use font_base;
     property use font_fallback;
@@ -156,9 +157,16 @@ propgroup fonts {
     property use font_base_units;
     property use font_journal_title_size;
     property use font_journal_title_units;
+    property use font_entry_title;
+    property use font_entry_title_size;
+    property use font_entry_title_units;
     property use font_module_heading_size;
     property use font_module_heading_units;
+    property use font_module_text;
+    property use font_module_text_size;
+    property use font_module_text_units;
 }
+
 set font_base = "tahoma, verdana, arial";
 set font_fallback = "sans-serif";
 set font_base_size = "1";
@@ -346,6 +354,8 @@ function Page::print_default_stylesheet 
 
     var string page_font = generate_font_css( $*font_base, $*font_fallback, $*font_base_size, $*font_base_units );
     var string journal_title_font = generate_font_css("", "", $*font_journal_title_size, $*font_journal_title_units);
+    var string entry_title_font = generate_font_css($*font_entry_title, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
+    var string module_font = generate_font_css($*font_module_text, $*font_fallback, $*font_module_text_size, $*font_module_text_units);
     var string module_title_font = generate_font_css("", "", $*font_module_heading_size, $*font_module_heading_units);
     
 
@@ -481,7 +491,7 @@ h1, h2, h3, h4 {font-weight: 700; font-v
 .module-section-one ul li a:hover, .module-section-one ul li a.current { $header_footer_hover_colors }
 .module-section-two a { $module_link_colors }
 .module-section-two .module-header a {text-decoration: none; }
-.module-section-two h2 {margin: 0; margin-bottom: 7px; $module_title_font padding: 0.2em; $module_title_colors }
+.module-section-two h2 {margin: 0; margin-bottom: 7px; padding: 0.2em; $module_title_colors }
 .module-section-two ul {list-style-type: none; margin-left: 0.5em; padding: 0; }
 .module-section-two ul ul {list-style-type: none; margin-left: 0.5em; padding: 0.5em; }
 .module-userprofile .userpic img {border: none; margin: 20px; }
@@ -491,6 +501,14 @@ h1, h2, h3, h4 {font-weight: 700; font-v
 .module-userprofile li {display: inline; padding: 5px; list-style: none; }
 .module-calendar .module-content {text-align: center; }
 .module-calendar table {margin-left: auto; margin-right: auto; }
+
+.module h2 {
+    $module_title_font
+}
+
+.module-content {
+    $module_font
+}
 
 .two-columns-right #entries, 
 .two-columns-right.page-entry .entry-wrapper, 
@@ -517,6 +535,11 @@ h1, h2, h3, h4 {font-weight: 700; font-v
 .page-entry #comments {padding-top:20px;}
 
 .entry-title, .comment-title {margin:0 120px .5em 0; padding: 0.2em;border: solid 1px $*color_entry_title_border; $entry_title_colors }
+
+.entry .entry-title {
+    $entry_title_font
+}
+
 .two-columns-right .entry-title, .two-columns-right .comment-title {margin:0 120px .5em 0;}
 .two-columns-left .entry-title, .two-columns-left .comment-title  {margin:0 0 .5em 120px;}
 
--------------------------------------------------------------------------------
Flat | Top-Level Comments Only
mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)

[staff profile] mark 2010-04-05 06:01 am (UTC)(link)
Welcome to changelog, [personal profile] fu! ;-)
fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)

[personal profile] fu 2010-04-05 12:23 pm (UTC)(link)
IT IS GOOD TO BE HERE.

(Though, granted I've always kinda been here. Still!)
ninetydegrees: Art: self-portrait (believe)

Hello, Fu! ^_^

[personal profile] ninetydegrees 2010-04-05 08:31 am (UTC)(link)
You now have a magic wand! (That's the icon I use for staff people).
fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)

Re: Hello, Fu! ^_^

[personal profile] fu 2010-04-05 12:24 pm (UTC)(link)
*curtsies*

Love it! Thanks for the welcome *g*
yvi: Kaylee half-smiling, looking very pretty (Default)

[personal profile] yvi 2010-04-05 09:19 am (UTC)(link)
[personal profile] fu!
fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)

[personal profile] fu 2010-04-05 12:24 pm (UTC)(link)
[personal profile] yvi! ^__^
Flat | Top-Level Comments Only