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-15 11:11 am

[dw-free] Modish: unreadable text in comments in some themes

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

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

Tweaks, including using (new) properties where relevant.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/core2.s2
  • bin/upgrading/s2layers/core2base/layout.s2
  • bin/upgrading/s2layers/modish/layout.s2
  • bin/upgrading/s2layers/modish/themes.s2
--------------------------------------------------------------------------------
diff -r c2eb4fe429bd -r d097898a2272 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Fri Oct 15 19:02:41 2010 +0800
+++ b/bin/upgrading/s2layers/core2.s2	Fri Oct 15 19:11:08 2010 +0800
@@ -1829,8 +1829,10 @@ set color_entry_interaction_links_visite
 ## Journal style - element colors
 ##===============================
 
+property Color color_comment_title { des = "Comment title color"; }
 property Color color_comment_title_background { des = "Comment title background color"; }
 
+set color_comment_title = "";
 set color_comment_title_background = "";
 
 ##===============================
diff -r c2eb4fe429bd -r d097898a2272 bin/upgrading/s2layers/core2base/layout.s2
--- a/bin/upgrading/s2layers/core2base/layout.s2	Fri Oct 15 19:02:41 2010 +0800
+++ b/bin/upgrading/s2layers/core2base/layout.s2	Fri Oct 15 19:11:08 2010 +0800
@@ -73,7 +73,8 @@ propgroup colors {
     property use color_entry_title;
     property use color_entry_title_background;
     property use color_entry_interaction_links;
-    
+
+    property use color_comment_title;
     property use color_comment_title_background;
 
 }
@@ -122,6 +123,7 @@ set color_entry_interaction_links = "";
 ## Comment Colors
 ##===============================
 
+set color_comment_title = "";
 set color_comment_title_background = "";
 
 ##===============================
@@ -285,7 +287,7 @@ function Page::print_default_stylesheet(
 
     var string page_title_colors = generate_color_css($*color_page_title, new Color, new Color);
     var string entry_title_colors = generate_color_css($*color_entry_title, $*color_entry_title_background, new Color);
-    var string comment_title_colors = generate_color_css(new Color, $*color_comment_title_background, new Color);
+    var string comment_title_colors = generate_color_css($*color_comment_title, $*color_comment_title_background, new Color);
     var string module_title_colors = generate_color_css($*color_module_title, $*color_module_title_background, new Color);
 
     var string page_link_colors = generate_color_css($*color_page_link, new Color, new Color);
diff -r c2eb4fe429bd -r d097898a2272 bin/upgrading/s2layers/modish/layout.s2
--- a/bin/upgrading/s2layers/modish/layout.s2	Fri Oct 15 19:02:41 2010 +0800
+++ b/bin/upgrading/s2layers/modish/layout.s2	Fri Oct 15 19:11:08 2010 +0800
@@ -11,8 +11,8 @@ function print_stylesheet() {
 function print_stylesheet() {
 
     var string header_colors = generate_color_css( new Color, $*color_header_background, new Color );
-    var string entry_title_colors = generate_color_css( $*color_entry_title, new Color, new Color );
-    var string comment_header_link_colors = generate_color_css( $*color_entry_title, new Color, new Color );
+    var string entry_title_colors = generate_color_css( $*color_entry_title, $*color_entry_title_background, $*color_entry_border );
+    var string comment_title_colors = generate_color_css( $*color_comment_title, $*color_comment_title_background, $*color_entry_border );
     var string module_header_link_colors = generate_color_css( $*color_module_title, new Color, new Color );
     var string module_navlinks_colors = generate_color_css( $*color_page_title, $*color_page_link, new Color );
     var string module_navlinks_active_colors = generate_color_css( new Color, $*color_page_link_active, new Color );
@@ -80,12 +80,18 @@ font-family: $*font_base, Verdana, Arial
 .entry { margin-bottom: 3em;
 border: none; }
 
-.entry .entry-title { border-bottom: 2px solid $*color_entry_border;
+.entry .entry-title {
+    $entry_title_colors
+    border-width: 0 0 2px;
     padding: .25em 5px;
-    margin-bottom: .5em;}
-.entry .entry-title a, 
-.entry .entry-title a:visited { $entry_title_colors
-text-decoration: none }
+    margin-bottom: .5em;
+    }
+
+.entry .entry-title a,
+.entry .entry-title a:visited {
+    text-decoration: none;
+    }
+
 .entry .entry-title a:hover { text-decoration: underline; }
 
 .entry .datetime { font-size: small;
@@ -124,11 +130,19 @@ ul.entry-interaction-links { text-align:
 
 .partial .comment { margin-bottom: 0;} 
 
-.comment .header { border-bottom: 1px solid $*color_entry_border;
+.comment .header {
+    $comment_title_colors
+    border-width: 0 0 1px;
     padding: 2px 5px;
-    margin-bottom: .5em;}
-.comment .header a, 
-.comment .header a:visited { $comment_header_link_colors }
+    margin-bottom: .5em;
+    }
+
+.comment .header a,
+.comment .header a:visited {
+    $comment_title_colors
+    border: none;
+    }
+
 .comment-title { margin: 0;
     padding: 0 0 .25em 0;
     font-weight: bold; }
@@ -146,13 +160,14 @@ ul.entry-interaction-links { text-align:
    content: "- ";
    }
 
-.comment .poster-ip { font-size: small;
-    color: #999999; }
+.comment .poster-ip {
+    color: $*color_page_text;
+    font-size: small;
+    }
 
 .comment-content { margin-top: 1em; }
 
 .comment .edittime { margin-top: 1em; }
-.comment .header .datetime { color: $*color_entry_title; }
 
 .comment .multiform-checkbox { display: block;
     text-align: right;
diff -r c2eb4fe429bd -r d097898a2272 bin/upgrading/s2layers/modish/themes.s2
--- a/bin/upgrading/s2layers/modish/themes.s2	Fri Oct 15 19:02:41 2010 +0800
+++ b/bin/upgrading/s2layers/modish/themes.s2	Fri Oct 15 19:11:08 2010 +0800
@@ -38,7 +38,6 @@ set color_entry_text = "#222";
 set color_entry_text = "#222";
 set color_entry_title = "#fff";
 set color_entry_title_background = "#78877a";
-set color_comment_title_background = "#e2f5dc";
 
 ##===============================
 ## Module Colors
@@ -49,14 +48,6 @@ set color_module_text = "#222";
 set color_module_text = "#222";
 set color_module_title = "#78877a";
 set color_module_title_background = "#e2f5dc";
-
-function Page::print_theme_stylesheet() {
-    """
-    .comment .header .datetime {
-        color: $*color_entry_text;
-        }
-    """;
-}
 
 
 #NEWLAYER: modish/cinnamonplumtea
@@ -99,6 +90,7 @@ set color_entry_text = "#4D4D4D";
 set color_entry_text = "#4D4D4D";
 set color_entry_title = "#DBBFCE";
 set color_entry_title_background = "#8F5A77";
+set color_comment_title = "#DBBFCE";
 set color_comment_title_background = "#8F5A77";
 
 ##===============================
@@ -113,10 +105,6 @@ set color_module_title_background = "#D1
 
 function Page::print_theme_stylesheet() {
     """
-    div.comment div.header {
-        background-color: $*color_comment_title_background;
-        }
-
     div.module-navlinks, div.module-time, div.module-powered {
         background-color: $*color_page_background;
         }
@@ -149,6 +137,12 @@ set color_page_link_visited = "#1BB31B";
 set color_page_link_visited = "#1BB31B";
 set color_page_text = "#1b1bb3";
 set color_page_title = "#1b1bb3";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_border = "#1b1bb3";
 
 ##===============================
 ## Module Colors
@@ -238,7 +232,7 @@ set color_entry_text = "#D6D6BF";
 set color_entry_text = "#D6D6BF";
 set color_entry_title = "#FF7E75";
 set color_entry_title_background = "#787856";
-set color_comment_title_background = "#6D6D4D";
+set color_comment_title = "#FF7E75";
 
 ##===============================
 ## Module Colors
@@ -315,7 +309,7 @@ set color_entry_text = "#ddd";
 set color_entry_text = "#ddd";
 set color_entry_title = "#B6ADDC";
 set color_entry_title_background = "#32045C";
-set color_comment_title_background = "#18002C";
+set color_comment_title = "#B6ADDC";
 
 ##===============================
 ## Module Colors
@@ -366,6 +360,12 @@ set color_footer_link = "#ef8229";
 set color_footer_link = "#ef8229";
 
 ##===============================
+## Entry Colors
+##===============================
+
+set color_entry_border = "#fff";
+
+##===============================
 ## Module Colors
 ##===============================
 
@@ -395,6 +395,12 @@ set color_page_text = "#000";
 set color_page_text = "#000";
 set color_page_title = "#9A7EA2";
 set color_header_background = "#c2d7a6";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_border = "#000";
 
 
 #NEWLAYER: modish/porcelainteacup
@@ -490,6 +496,7 @@ set color_entry_text = "#616161";
 set color_entry_text = "#616161";
 set color_entry_title = "#FFEBC9";
 set color_entry_title_background = "#F5AE78";
+set color_comment_title = "#FFEBC9";
 set color_comment_title_background = "#F5AE78";
 
 ##===============================
@@ -504,10 +511,6 @@ set color_module_title_background = "#9F
 
 function Page::print_theme_stylesheet() {
     """
-    div.comment div.header {
-        background-color: $*color_comment_title_background;
-        }
-
     div.module-navlinks, div.module-time, div.module-powered {
         background-color: $*color_page_background;
         }
@@ -565,12 +568,14 @@ set color_footer_link_visited = "#132245
 ##===============================
 
 set color_entry_background = "#aceded";
+set color_entry_border = "#a66229";
 set color_entry_link = "#a66229";
 set color_entry_link_hover = "#248e8e";
 set color_entry_link_visited = "#000";
 set color_entry_text = "#132245";
 set color_entry_title = "#a66229";
 set color_entry_title_background = "#ffe8b9";
+set color_comment_title = "#a66229";
 set color_comment_title_background = "#ffe8b9";
 
 ##===============================
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org