fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2011-04-19 08:25 am

[dw-free] Colorside themes with entry background colors look a bit awkward

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

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

Add padding when entry background color doesn't match page background color.

Patch by [personal profile] fu.

Files modified:
  • bin/upgrading/s2layers/colorside/layout.s2
  • bin/upgrading/s2layers/colorside/themes.s2
--------------------------------------------------------------------------------
diff -r c60ea7d8e110 -r 1ea9ee737769 bin/upgrading/s2layers/colorside/layout.s2
--- a/bin/upgrading/s2layers/colorside/layout.s2	Tue Apr 19 15:29:01 2011 +0800
+++ b/bin/upgrading/s2layers/colorside/layout.s2	Tue Apr 19 16:25:31 2011 +0800
@@ -47,6 +47,11 @@ function print_stylesheet() {
     var string module_alt_link_colors = generate_color_css( $*color_page_link, new Color, new Color );
 
     var string footer_colors = generate_color_css( new Color, $*color_page_background, new Color );
+
+    var string entry_content_padding = "";
+    if ( $*color_entry_background.as_string != $*color_page_background.as_string ) {
+        $entry_content_padding = "padding: 5px;";
+    }
 
     var string entry_padding = "";
     if ( $*entry_userpic_style == "" ) { $entry_padding = "110px"; }
@@ -196,7 +201,7 @@ margin: .75em 0; }
 .entry .contents .userpic { position: absolute;
 top: -1em; }
 
-.entry-content { margin-top: 2em; }
+.entry-content { margin-top: 2em; $entry_content_padding }
 
 .metadata { margin: 1em 0 0 0; }
 .metadata.top-metadata { margin-top: 1.25em; margin-bottom: 2em; }
diff -r c60ea7d8e110 -r 1ea9ee737769 bin/upgrading/s2layers/colorside/themes.s2
--- a/bin/upgrading/s2layers/colorside/themes.s2	Tue Apr 19 15:29:01 2011 +0800
+++ b/bin/upgrading/s2layers/colorside/themes.s2	Tue Apr 19 16:25:31 2011 +0800
@@ -37,7 +37,6 @@ function Page::print_theme_stylesheet ()
     """
     #header,
     #title, #subtitle, #pagetitle,
-    .entry-content,
     .module-header {
         padding: 5px;
         }
@@ -126,7 +125,6 @@ function Page::print_theme_stylesheet ()
     """
     #header,
     #title, #subtitle, #pagetitle,
-    .entry-content,
     .module-header {
         padding: 5px;
         }
@@ -208,6 +206,9 @@ set color_module_title = "#fff";
 set color_module_title = "#fff";
 set color_module_title_background = "#666";
 
+function Page::print_theme_stylesheet () {
+    """ .entry-content { padding: 5px; } """;
+}
 
 #NEWLAYER: colorside/nnwm2009
 layerinfo type = "theme";
@@ -507,7 +508,6 @@ function Page::print_theme_stylesheet ()
     """
     #header,
     #title, #subtitle, #pagetitle,
-    .entry-content,
     .module-header {
         padding: 5px;
         }
--------------------------------------------------------------------------------