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

[dw-free] Add a .no-title class if an entry/comment doesn't have a title

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

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

Add .no-subject class, style to account for overlaps when there is no
subject, expose wizard properties, some refactoring.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/bases/layout.s2
  • bin/upgrading/s2layers/basicboxes/layout.s2
  • bin/upgrading/s2layers/blanket/layout.s2
  • bin/upgrading/s2layers/boxesandborders/layout.s2
  • bin/upgrading/s2layers/brittle/layout.s2
  • bin/upgrading/s2layers/colorside/layout.s2
  • bin/upgrading/s2layers/core2.s2
  • bin/upgrading/s2layers/core2base/layout.s2
  • bin/upgrading/s2layers/crossroads/layout.s2
  • bin/upgrading/s2layers/drifting/layout.s2
  • bin/upgrading/s2layers/easyread/layout.s2
  • bin/upgrading/s2layers/fiveam/layout.s2
  • bin/upgrading/s2layers/fluidmeasure/layout.s2
  • bin/upgrading/s2layers/funkycircles/layout.s2
  • bin/upgrading/s2layers/modish/layout.s2
  • bin/upgrading/s2layers/modular/layout.s2
  • bin/upgrading/s2layers/negatives/layout.s2
  • bin/upgrading/s2layers/nouveauoleanders/layout.s2
  • bin/upgrading/s2layers/skittlishdreams/layout.s2
  • bin/upgrading/s2layers/steppingstones/layout.s2
  • bin/upgrading/s2layers/tranquilityiii/layout.s2
  • bin/upgrading/s2layers/zesty/layout.s2
--------------------------------------------------------------------------------
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/bases/layout.s2
--- a/bin/upgrading/s2layers/bases/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/bases/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -30,6 +30,8 @@
     property use reg_firstdayofweek;
     property use entry_datetime_format_group;
     property use comment_datetime_format_group;
+    property use all_entrysubjects;
+    property use all_commentsubjects;
 }
 
 set module_layout_sections = "none|(none)|one|Group One";
@@ -672,7 +674,22 @@
 
 #entries > .inner {border-top: 0.083em solid $*color_entry_background;}
 
-.entry-title {$entry_title_font border: 0.083em solid $*color_entry_border; border-left: 0; border-right: 0; padding: 0.5em; margin: 0; color: $*color_entry_text; background: $*color_entry_title_background; }
+.entry-title {
+    background: $*color_entry_title_background;
+    color: $*color_entry_text;
+    border-bottom: .083em solid $*color_entry_border;
+    border-top: .083em solid $*color_entry_border;
+    $entry_title_font
+    margin: 0;
+    padding: .5em;
+    }
+
+.no-subject .entry .entry-title {
+    background: none;
+    border: none;
+    padding: 0;
+    }
+
 .entry-title a {text-decoration: none; color: $*color_entry_title; }
 
 .datetime { font-size: 0.75em; text-transform: uppercase; display: block; color: $*color_entry_text; padding: 0.5em 1em 0.5em 1em; 
@@ -789,18 +806,17 @@
 .comment-title {
     $comment_title_font
     font-weight: normal;
-    padding: 0.5em;
+    margin: 0;
+    padding: .5em;
+    }
+
+.no-subject .comment .comment-title {
+    background: none;
+    padding: 0;
     }
 
 .comment-title a {display: block; }
 
-.comment-title h4 {
-    font-size: inherit;
-    font-weight: inherit;
-    margin: 0;
-    padding: 0;
-}
-
 .full .comment .datetime { border-top: .083em solid $*color_entry_border;}
 .full .comment-poster, .poster-ip { border-bottom: .083em solid $*color_entry_border; display: block; padding: 0 .5em; }
 
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/basicboxes/layout.s2
--- a/bin/upgrading/s2layers/basicboxes/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/basicboxes/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -306,19 +306,17 @@
     margin-bottom: .5em; }
 #primary .comment .comment-title a, 
 #primary .comment .comment-title a:visited { $comment_title_colors }
-.comment-title { margin: 0;
-    padding: 0 0 .25em 0;
-    font-weight: bold; }
+
+.comment-title {
+    font-weight: bold;
+    padding: 0 0 .25em;
+    }
 
 .partial .comment-title {
    display: inline;
    margin-right: .2em;
    }
 
-.partial .comment-title h4 {
-   display: inline;
-   }
-
 .partial .comment-poster:before {
    content: "- ";
    }
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/blanket/layout.s2
--- a/bin/upgrading/s2layers/blanket/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/blanket/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -30,6 +30,8 @@
     property use reg_firstdayofweek;
     property use entry_datetime_format_group;
     property use comment_datetime_format_group;
+    property use all_entrysubjects;
+    property use all_commentsubjects;
 }
 
 set layout_type = "one-column";
@@ -591,6 +593,10 @@
     text-transform: lowercase;
     }
 
+.no-subject .entry .entry-title {
+    background: none;
+    }
+
 h3.entry-title a {
     $entry_title_colors
     }
@@ -739,13 +745,11 @@
 
 .comment-title {
     $comment_title_font
+    margin: 0;
     }
 
-.comment-title h4 {
-    font-size: inherit;
-    font-weight: inherit;
-    margin: 0;
-    padding: 0;
+.no-subject .comment .comment-title {
+    background: none;
     }
 
 hr.above-entry-interaction-links,
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/boxesandborders/layout.s2
--- a/bin/upgrading/s2layers/boxesandborders/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/boxesandborders/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -301,6 +301,7 @@
 .entry .entry-title { 
    padding: .25em 5px;
    margin-bottom: .5em;}
+
 .entry .entry-title a, 
 .entry .entry-title a:visited { $entry_title_link_colors
 text-decoration: none }
@@ -347,19 +348,17 @@
     border-left: 10px dashed $*color_entry_border; }
 .comment .header a, 
 .comment .header a:visited { $comment_header_link_colors }
-.comment-title { margin: 0;
-   padding: 0 0 .25em 0;
-   font-weight: bold; }
+
+.comment-title {
+    font-weight: bold;
+    padding: 0 0 .25em;
+    }
 
 .partial .comment-title {
    display: inline;
    margin-right: .2em;
    }
 
-.partial .comment-title h4 {
-   display: inline;
-   }
-
 .partial .comment-poster:before {
    content: "- ";
    }
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/brittle/layout.s2
--- a/bin/upgrading/s2layers/brittle/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/brittle/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -34,6 +34,8 @@
     property use reg_firstdayofweek;
     property use entry_datetime_format_group;
     property use comment_datetime_format_group;
+    property use all_entrysubjects;
+    property use all_commentsubjects;
 }
 
 set sidebar_width = "15em";
@@ -514,6 +516,10 @@
     color: $*color_entry_title;
     }
 
+.no-subject .entry .entry-title {
+    background: none;
+    }
+
 h3.entry-title a { color: $*color_entry_title; }
 
 .datetime {
@@ -826,14 +832,12 @@
 
 .comment-title {
     $comment_title_font
+    margin: 0;
     }
 
-.comment-title h4 {
-    font-size: inherit;
-    font-weight: inherit;
-    margin: 0;
-    padding: 0;
-}
+.no-subject .comment .comment-title {
+    background: none;
+    }
 
 hr.above-entry-interaction-links, hr.below-reply-container { display: none; }
 
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/colorside/layout.s2
--- a/bin/upgrading/s2layers/colorside/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/colorside/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -176,9 +176,18 @@
 .entry .header { $entry_header_colors
     padding: 0;
     margin: 0 0 .5em 0;}
+
+.entry .entry-title {
+    margin: 5px;
+    padding: .15em 0;
+    }
+
+.no-subject .entry-title {
+    padding: 0;
+    }
+
 .entry .entry-title a, 
 .entry .entry-title a:visited { $entry_title_link_colors }
-.entry .entry-title { margin: 5px; padding: .15em 0; }
 
 .entry .restrictions  { display: block; 
     font-size: small;
@@ -200,7 +209,20 @@
 .entry .contents .userpic { position: absolute;
 top: -1em; }
 
-.entry-content { margin-top: 2em; $entry_content_padding }
+.entry-content { $entry_content_padding }
+
+.has-userpic .entry-content {
+    margin-top: 2.25em;
+    }
+
+.has-userpic.no-subject .entry-content {
+    margin-top: 2.75em;
+    }
+
+.page-recent .security-public.restrictions-none.journal-type-P.has-userpic.no-subject .entry-content,
+.page-day .security-public.restrictions-none.journal-type-P.has-userpic.no-subject .entry-content {
+    margin-top: 4.75em;
+    }
 
 .metadata { margin: 1em 0 0 0; }
 .metadata.top-metadata { margin-top: 1.25em; margin-bottom: 2em; }
@@ -234,19 +256,17 @@
     margin: 0 0 1em 0;}
 .comment .header a, 
 .comment .header a:visited { $entry_title_link_colors }
-.comment-title { margin: 0;
-    padding: 0 0 .25em 0;
-    font-weight: bold; }
+
+.comment-title {
+    font-weight: bold;
+    padding: 0 0 .25em;
+    }
 
 .partial .comment-title {
    display: inline;
    margin-right: .2em;
    }
 
-.partial .comment-title h4 {
-   display: inline;
-   }
-
 .partial .comment-poster:before {
    content: "- ";
    }
@@ -259,7 +279,9 @@
 .comment .contents .userpic { position: absolute;
 top: 0; }
 
-.comment-content { margin-top: 2em; }
+.comment-content { margin-top: 1em; }
+
+.has-userpic .comment-content { margin-top: 2em; }
 
 .comment .edittime { margin-top: 1em; }
 .comment .header .datetime { font-size: small;
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/core2.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -2689,7 +2689,6 @@
     maxlength = 20;
     size = 10;
     example = "No Subject";
-    note = "This only appears in places where a subject line is required, such as on a month view.";
 }
 
 property string text_nosubject_screenreader {
@@ -2698,6 +2697,7 @@
     size = 10;
     example = "No Subject";
     note = "This only is visible to screenreaders or with CSS disabled. Do not set this to empty.";
+    noui = 1;
 }
 
 property string text_calendar_num_entries {
@@ -2727,15 +2727,13 @@
 set text_cuttagcontrols_nocuttags = "No cut tags";
 
 property bool all_entrysubjects {
-    des = "For all entries, display the replacement text when no subject is specified";
-    note = "If set, all entries will display the text_nosubject where no subject is specified.  Otherwise, it only appears in places where a subject line is required, such as on a month view.";
-    noui = 1;
+    des = "Display the replacement text when no subject is specified in entries";
+    note = "If disabled, the replacement text will still appear where a subject is required, such as on month views.";
 }
 
 property bool all_commentsubjects {
-    des = "For all comments, display the replacement text when no subject is specified";
-    note = "If set, comments will display the text_nosubject where no subject is specified.";
-    noui = 1;
+    des = "Display the replacement text when no subject is specified in comments";
+    note = "If disabled, the replacement text will still appear where a subject is required, such as in collapsed comments.";
 }
 
 property string text_noentries_recent {
@@ -4796,7 +4794,7 @@
 function EntryLite::print_subject( string{} opts ) [fixed] {
     if ($this isa Comment) {
         var Comment c = $this as Comment;
-        """<div class="comment-title"><h4>""";
+        """<h4 class="comment-title">""";
         if ($c.screened) {
             print $*text_screened;
         }
@@ -4807,7 +4805,7 @@
             print "<span class='echi'>${c.echi}.</span> ";
         }
         print $this->formatted_subject( $opts );
-        "</h4></div>";
+        "</h4>";
     }
     else {
         if ($this isa StickyEntry) {
@@ -4835,6 +4833,7 @@
 }
 function Entry::print_wrapper_start() {
 # FIXME: need to ensure that calling the alternate function doesn't interfere with the printing of comments or the printing of module groups.
+    var Page p = get_page();
     var string alternate = alternate ("entry-wrapper-odd", "entry-wrapper-even");
     var string security = $this.security ? $this.security : "public";
     var string adult_content_level = $this.adult_content_level ? $this.adult_content_level : "none";
@@ -4847,14 +4846,16 @@
     }
     var string userpic = $this.userpic ? "has-userpic" : "no-userpic";
 
+    var string entrysubject = (not $*all_entrysubjects and $.subject == "" and $p.view != "month") ? "no-subject" : "has-subject";
+
     #additional classes for sticky entries added
     if ($this isa StickyEntry) {
-        """<div class="sticky-entry-wrapper entry-wrapper $alternate security-$security restrictions-$adult_content_level $journal_type $poster $journal $userpic" id="sticky-entry-wrapper-$this.itemid">\n""";
+        """<div class="sticky-entry-wrapper entry-wrapper $alternate security-$security restrictions-$adult_content_level $journal_type $poster $journal $userpic $entrysubject" id="sticky-entry-wrapper-$this.itemid">\n""";
         """<div class="separator separator-before"><div class="inner"></div></div>\n""";
         """<div class="sticky-entry entry" id="sticky-entry-$this.itemid">\n""";
     }
     else {
-        """<div class="entry-wrapper $alternate security-$security restrictions-$adult_content_level $journal_type $poster $journal $userpic" id="entry-wrapper-$this.itemid">\n""";
+        """<div class="entry-wrapper $alternate security-$security restrictions-$adult_content_level $journal_type $poster $journal $userpic $entrysubject" id="entry-wrapper-$this.itemid">\n""";
         """<div class="separator separator-before"><div class="inner"></div></div>\n""";
         """<div class="entry" id="entry-$this.itemid">\n""";
     }
@@ -4871,11 +4872,12 @@
     if ($this.deleted or $this.fromsuspended or $this.screened_noshow) { $poster =  "poster-hidden"; }
     var string full = $this.full ? "full" : "partial";
     var string userpic = $this.userpic ? "has-userpic" : "no-userpic";
+    var string commentsubject = (not $*all_commentsubjects and $.subject == "" and $.full) ? "no-subject" : "has-subject";
     var string entryauthor = "";
     if (not isnull $ep and defined $this.poster and $this.poster.username == $ep.entry.poster.username) {
         $entryauthor = "entry-author";
     }
-    """<div class="comment-wrapper $alternate $screened $frozen $deletedstate $suspendedstate $poster $entryauthor $full $userpic">\n""";
+    """<div class="comment-wrapper $alternate $screened $frozen $deletedstate $suspendedstate $poster $entryauthor $full $userpic $commentsubject">\n""";
     """<div class="separator separator-before"><div class="inner"></div></div>\n""";
     """<div class="comment" id="comment-$this.dom_id">\n""";
     """<div class="inner">\n""";
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/core2base/layout.s2
--- a/bin/upgrading/s2layers/core2base/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/core2base/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -29,6 +29,8 @@
     property use reg_firstdayofweek;
     property use entry_datetime_format_group;
     property use comment_datetime_format_group;
+    property use all_entrysubjects;
+    property use all_commentsubjects;
 }
 
 set sidebar_width = "15em";
@@ -471,6 +473,11 @@
     $entry_title_colors
 }
 
+.no-subject .entry .entry-title {
+    background: none;
+    border: none;
+}
+
 .entry a { $entry_link_colors }
 .entry a:visited { $entry_link_visited_colors }
 .entry a:hover { $entry_link_hover_colors }
@@ -540,19 +547,18 @@
     padding: .5em 0;
 }
 
+.comment .comment-title {
+    $comment_title_font
+    margin: 0;
+}
+
 .comment .comment-title, .comment .comment-title a {
     $comment_title_colors
 }
 
-.comment .comment-title {
-    $comment_title_font
-}
-
-.comment-title h4 {
-    font-size: inherit;
-    font-weight: inherit;
-    margin: 0;
-    padding: 0;
+.no-subject .comment .comment-title {
+    background: none;
+    border: none;
 }
 
 ul.comment-management-links {
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/crossroads/layout.s2
--- a/bin/upgrading/s2layers/crossroads/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/crossroads/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -265,7 +265,7 @@
 blockquote > p:first-child { margin-top: 0; }
 dl dt { font-weight: bold; }
 
-h1, h2, h3, h4, .comment-title {
+h1, h2, h3, h4 {
     font-weight: normal;
     padding-left: .25em;
     padding-right: .25em;
@@ -344,6 +344,9 @@
 .entry .datetime { font-size: small; }
 
 .entry-content { padding: .5em; }
+
+.has-userpic .entry-content { padding-top: 1.25em; }
+
 .entry-content li { margin-left: 1em; }
 .entry-content hr { display: block;
     margin: 1em 10%; }
@@ -422,20 +425,18 @@
    margin-right: .2em;
    }
 
-.partial .comment-title h4 {
-   display: inline;
-   }
-
 .partial .comment-poster:before {
    content: "- ";
    }
 
-.comment-title { margin: 0;
+.comment-title {
+    background-color: $*color_entry_title_background;
+    color: $*color_entry_title;
     padding: .25em;
     font-size: large;
     min-height: 1em;
-    background-color: $*color_entry_title_background;
-    color: $*color_entry_title; }
+    }
+
 .comment-title a,
 .comment-title a:visited { color: $*color_entry_title; }
 
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/drifting/layout.s2
--- a/bin/upgrading/s2layers/drifting/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/drifting/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -42,6 +42,8 @@
     property use reg_firstdayofweek;
     property use entry_datetime_format_group;
     property use comment_datetime_format_group;
+    property use all_entrysubjects;
+    property use all_commentsubjects;
 }
 
 set layout_type            = "two-columns-left";
@@ -675,6 +677,13 @@
         $entry_title_font
     }
 
+    /* Set padding to restore height to the decorative header */
+    /* Use standard H3 font size or custom size if set */
+    .no-subject .entry .entry-title {
+        padding: 1.17em;
+        padding: $*font_entry_title_size$*font_entry_title_units;
+    }
+
     .entry .trust-filter {
         padding-left: 10px;
     }
@@ -764,15 +773,9 @@
 
     .comment-title {
         $comment_title_font
+        margin: 0;
         }
 
-    .comment-title h4 {
-        font-size: inherit;
-        font-weight: inherit;
-        margin: 0;
-        padding: 0;
-    }
-
     .comment .subject {
         border: 1px solid $*color_entry_border;
         border-left: none;
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/easyread/layout.s2
--- a/bin/upgrading/s2layers/easyread/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/easyread/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -32,6 +32,8 @@
     property use reg_firstdayofweek;
     property use entry_datetime_format_group;
     property use comment_datetime_format_group;
+    property use all_entrysubjects;
+    property use all_commentsubjects;
 }
 
 set layout_type = "one-column-split";
@@ -97,6 +99,8 @@
 set font_journal_subtitle = """APHont, "Helvetica Neue", Arial, Helvetica, Geneva""";
 set font_journal_subtitle_size = "1.5";
 set font_journal_subtitle_units = "em";
+set font_entry_title_size = "2";
+set font_entry_title_units = "em";
 
 ##===============================
 ## Display settings - modules
@@ -536,15 +540,9 @@
 
 .comment-title {
     $comment_title_font
+    margin: 0;
     }
 
-.comment-title h4 {
-    font-size: inherit;
-    font-weight: inherit;
-    margin: 0;
-    padding: 0;
-}
-
 /* Entry header */
 
 .has-userpic .entry .header {
@@ -560,6 +558,17 @@
     $entrytitle_padding
 }
 
+/* Set height to keep spacing */
+/* Use standard H3 font size */
+.no-subject .entry .entry-title {
+    background: none;
+    height: 1.17em;
+}
+
+.entry h3.entry-title a {
+    text-decoration: none;
+}
+
 .entry .metadata-label {
     font-weight: bold;
 }
@@ -582,14 +591,6 @@
     margin-top: 0;
 }
 
-.entry h3.entry-title {
-    font-size: 2em;
-}
-
-.entry h3.entry-title a {
-    text-decoration: none;
-}
-
 .entry .contents .userpic a img {
     border: 0;
     margin-bottom: 10px;
@@ -664,6 +665,11 @@
 /*
  * Comments
  */
+
+.no-subject .comment .comment-title {
+    background: none;
+}
+
 #comments .userpic a img, .comment-wrapper .userpic a img  {
     border: 0;
     margin-bottom: 10px;
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/fiveam/layout.s2
--- a/bin/upgrading/s2layers/fiveam/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/fiveam/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -651,10 +651,6 @@
 
 .partial .comment-title {
     display: inline !important;
-    }
-
-.comment-title h4 {
-    display: inline !important;
     padding-right: .5em;
     }
 
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/fluidmeasure/layout.s2
--- a/bin/upgrading/s2layers/fluidmeasure/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/fluidmeasure/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -308,7 +308,7 @@
     padding: 3em 0 0 0;}
 
 .entry .header { padding: 0 .5em; }
-.entry .header .entry-title { background-color: $*color_entry_title_background;
+.entry .entry-title { background-color: $*color_entry_title_background;
     border-radius: 1em;
     -moz-border-radius: 1em;
     -webkit-border-radius: 1em;
@@ -316,8 +316,8 @@
     margin: -4em 15em 1em 1.5em;
     padding: .5em;
     float: left; }
-.entry .header .entry-title a,
-.entry .header .entry-title a:visited { color: $*color_entry_title; }
+.entry .entry-title a,
+.entry .entry-title a:visited { color: $*color_entry_title; }
 
 .entry .header .restrictions {position: absolute;
     top: 1.5em;
@@ -392,21 +392,21 @@
 
 .partial .comment { margin-bottom: 0; padding: 1em;} 
 
-.comment-title { margin: -4.5em 14em 1em 1em;
-    padding: .5em;
-    float: left;
+.comment .comment-title {
     background-color: $*color_comment_title_background;
     border: 1px solid $*color_comment_title_background;
     border-radius: 1em;
     color: $*color_comment_title;
-    -moz-border-radius: 1em;
-    -webkit-border-radius: 1em;
-    -khtml-border-radius: 1em; }
+    float: left;
+    margin: -4.5em 14em 1em 1em;
+    padding: .5em;
+    }
+
 .comment-title a { color: $*color_comment_title; }
-.partial .comment-title { display: inline; margin: -.5em 0 0 0; }
 
-.partial .comment-title h4 {
+.partial .comment-title {
     display: inline;
+    margin: -.5em 0 0;
     }
 
 .partial .comment-poster:before {
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/funkycircles/layout.s2
--- a/bin/upgrading/s2layers/funkycircles/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/funkycircles/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -535,7 +535,7 @@
 
         .page-recent .entry-wrapper.has-userpic.journal-type-P .entry .contents,
         .page-day .entry-wrapper.has-userpic.journal-type-P .entry .contents {
-            padding: 55px 2em 2em;
+            padding: 50px 2em 2em;
             }
 
     .tags-container ul.ljtaglist {
@@ -658,7 +658,7 @@
 
     .partial .comment-title {
         display: inline;
-        padding-bottom: .5em;
+        padding-right: .2em;
         }
 
         .partial .comment-title a,
@@ -675,7 +675,7 @@
 .contents .userpic {
     position: absolute;
     text-align: center;
-    top: -10px;
+    top: -5px;
     }
 
     .no-userpic .userpic {
@@ -695,17 +695,10 @@
     border-bottom: 1px dashed $*color_entry_poster_border;
     display: block;
     font-weight: bold;
+    margin-bottom: 20px;
     padding-bottom: .5em;
     }
 
-    .has-userpic .poster {
-        margin-bottom: 20px;
-        }
-
-    .has-userpic .comment .poster {
-        margin-bottom: 40px;
-        }
-
     .entry .poster:before {
         content: 'Posted by ';
         }
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/modish/layout.s2
--- a/bin/upgrading/s2layers/modish/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/modish/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -153,19 +153,16 @@
     border: none;
     }
 
-.comment-title { margin: 0;
-    padding: 0 0 .25em 0;
-    font-weight: bold; }
+.comment-title {
+    font-weight: bold;
+    padding: 0 0 .25em;
+    }
 
 .partial .comment-title {
    display: inline;
    margin-right: .2em;
    }
 
-.partial .comment-title h4 {
-   display: inline;
-   }
-
 .partial .comment-poster:before {
    content: "- ";
    }
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/modular/layout.s2
--- a/bin/upgrading/s2layers/modular/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/modular/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -154,8 +154,7 @@
 blockquote > p:first-child { margin-top: 0; }
 dl dt { font-weight: bold; }
 
-h1, h2, h3, h4,
-.comment-title {
+h1, h2, h3, h4 {
     font-weight: normal;
     padding-left: .25em;
     padding-right: .25em;
@@ -360,13 +359,9 @@
 
 .partial .comment-title {
     background-color: transparent;
-   display: inline;
-   margin-right: .2em;
-   }
-
-.partial .comment-title h4 {
-   display: inline;
-   }
+    display: inline;
+    margin-right: .2em;
+    }
 
 .partial .comment-poster:before {
    content: "- ";
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -32,6 +32,8 @@
     property use reg_firstdayofweek;
     property use entry_datetime_format_group;
     property use comment_datetime_format_group;
+    property use all_entrysubjects;
+    property use all_commentsubjects;
 }
 
 set userpics_position = "right";
@@ -456,21 +458,18 @@
 
     .comment-title {
         $comment_title_font
+        margin: 0;
         }
 
-    .comment-title h4 {
-        font-size: inherit;
-        font-weight: inherit;
-        margin: 0;
-        padding: 0;
-    }
+    .no-subject .comment .comment-title {
+        background: none;
+        }
+
     .partial .comment-title {
         display: inline;
         margin-right: .2em;
     }
-    .partial .comment-title h4 {
-        display: inline;
-    }
+
     .partial .comment-poster:before {
         content: "- ";
     }
@@ -512,6 +511,12 @@
         display: inline;
         padding-left: 0.5em;
     }
+
+    .no-subject .entry .entry-title {
+        background: none;
+        padding-left: 0;
+    }
+
     .entry-title a {
         color: $*color_entry_title;
     }
@@ -797,10 +802,11 @@
 #Print_body
 function Page::print_entry (Entry e)
 {
+var string raquo = (not $*all_entrysubjects and $e.subject == "" and $.view != "month") ? "" : "&raquo;";
     $e->print_wrapper_start();
     print "<div class=\"header\">";
     $e->print_userpic();
-    print "<div class=\"subject\">&raquo;";
+    print "<div class=\"subject\">$raquo";
             $e->print_metatypes();
             $e->print_subject();
         println "</div>";
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/nouveauoleanders/layout.s2
--- a/bin/upgrading/s2layers/nouveauoleanders/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/nouveauoleanders/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -471,7 +471,7 @@
     list-style: circle;
     }
 
-h1, h2, h3, h4, .comment-title {
+h1, h2, h3, h4 {
     font-style: italic;
     }
 
@@ -783,7 +783,7 @@
     text-align: right;
     }
 
-.comment-title h4 {
+.comment .comment-title {
     background: none;
     color: $*color_page_link;
     line-height: 1em;
@@ -793,11 +793,11 @@
     font-size: large;
     }
 
-.comment-title h4 a {
+.comment-title a {
    color: $*color_page_link;
    }
 
-.comment-title h4 a:visited {
+.comment-title a:visited {
    color: $*color_page_link_visited;
    }
 
@@ -807,10 +807,6 @@
    margin-right: .2em;
    }
 
-.partial .comment-title h4 {
-   display: inline;
-   }
-
 .partial .comment-poster:before {
    content: "- ";
    }
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/skittlishdreams/layout.s2
--- a/bin/upgrading/s2layers/skittlishdreams/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -10,7 +10,7 @@
 
 set entry_management_links = "text";
 set comment_management_links = "text";
-set all_commentsubjects = true;
+
 
 set text_entry_prev = "Previous";
 set text_entry_next = "Next";
@@ -46,6 +46,8 @@
     property use reg_firstdayofweek;
     property use entry_datetime_format_group;
     property use comment_datetime_format_group;
+    property use all_entrysubjects;
+    property use all_commentsubjects;
     property bool use_action_links_images {
         des = "Theme has images for the entry/comment links";
         noui = 1;
@@ -57,6 +59,7 @@
 set tags_page_type = "";
 set entryicons_position = "same";
 set custom_colors_template = "%%new%% .userpic a {background-color: %%background%%; border: solid 1px %%foreground%%;}";
+set all_commentsubjects = true;
 set use_action_links_images = true;
 
 propgroup colors {
@@ -554,7 +557,10 @@
     var string entryicon_css = "";
         if ($*entryicons_position == "same") {
             $entryicon_css = """
-            .two-columns-right .has-userpic .entry .header { margin-right: $entry_title_margin; }
+            .two-columns-right .has-userpic .entry .header,
+            .two-columns-right .has-userpic .entry .poster {
+                margin-right: $entry_title_margin;
+                }
             .two-columns-right .has-userpic .comment .header { margin-right: $comment_title_margin; }
 
             .two-columns-left .has-userpic .entry .header { margin-left: $entry_title_margin; }
@@ -571,7 +577,10 @@
         }
         elseif ($*entryicons_position == "opposite") {
             $entryicon_css = """
-            .two-columns-right .has-userpic .entry .header { margin-left: $entry_title_margin; }
+            .two-columns-right .has-userpic .entry .header,
+            .two-columns-right .has-userpic .entry .poster {
+                margin-left: $entry_title_margin;
+                }
             .two-columns-right .has-userpic .comment .header,
             .two-columns-right .has-userpic .comment .poster {
                 margin-left: $comment_title_margin;
@@ -750,30 +759,35 @@
 .page-entry .entry, .page-entry .comment, .page-entry .text_noentries_day {border:0px;}
 .page-entry #comments {padding-top:20px;}
 
+.entry-title, .comment-title {
+    $entry_title_colors
+    border: solid 1px $*color_entry_title_border;
+    margin: 0 0 .5em;
+    padding: .2em;
+    }
+
+.entry .entry-title {
+    $entry_title_font
+    }
+
 .comment-title {
     $comment_title_font
     }
 
-.comment-title h4 {
-    font-size: inherit;
-    font-weight: inherit;
+.entry-wrapper-even .entry-title,
+.comment-wrapper-even .comment-title {
+    $entry_title_colors
+    border: solid 1px $*color_entry_title_border_alt;
+    }
+
+.no-subject .entry .entry-title,
+.no-subject .comment .comment-title {
+    background: none;
+    border:none;
     margin: 0;
     padding: 0;
-}
-
-.entry-title, .comment-title {
-    border: solid 1px $*color_entry_title_border;
-    margin: 0 0 .5em;
-    padding: .2em;
-    $entry_title_colors
     }
 
-.entry .entry-title {
-    $entry_title_font
-}
-
-.entry-wrapper-even .entry-title, .comment-wrapper-even .comment-title {border: solid 1px $*color_entry_title_border_alt; $entry_title_colors }
-
 .userpic a {background-color: $*color_page_border; border: 0px; }
 .entry .userpic a, .comment .userpic a {background-color: $*color_entry_background; border: solid 2px $*color_page_border; display: block; position: absolute; padding: 5px; }
 
@@ -787,10 +801,22 @@
 
 .entry .userpic img, .comment .userpic img {border: none; }
 .no-userpic .comment {margin-top: 20px; }
-.no-userpic .comment-title {margin: 0px; }
+
+.no-userpic .comment-title {
+    margin: 0;
+    }
 
 .entry .time, .entry .date {padding: 0.2em; display: inline-block; }
-.entry-content, .comment-content {padding: 10px 0px; }
+
+.entry-content,
+.comment-content {
+    padding: 10px 0;
+    }
+
+.page-recent .security-public.restrictions-none.journal-type-P.has-userpic.no-subject .entry-content,
+.page-day .security-public.restrictions-none.journal-type-P.has-userpic.no-subject .entry-content {
+    padding-top: 20px;
+    }
 
 p {margin-top: .5em; margin-bottom: 0.5em; }
 blockquote {margin: 1em; padding: 1em; $blockquote_colors }
@@ -963,10 +989,6 @@
     margin-right: .2em;
     }
 
-.partial .comment-title h4 {
-    display: inline;
-    }
-
 .partial .comment-poster:before {
     content: "- ";
     }
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/steppingstones/layout.s2
--- a/bin/upgrading/s2layers/steppingstones/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/steppingstones/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -82,7 +82,9 @@
             .comment .contents .userpic { float: left;
                 margin: 0 .5em .5em -1.5em; }
 
-            .entry .header { padding-left: $entry_header_padding; }
+            .entry .header,
+            .entry .poster { padding-left: $entry_header_padding; }
+            .entry .poster { margin-left: -.5em; }
             """;
         }
         elseif ($*userpics_position == "right") {
@@ -187,6 +189,13 @@
     position: relative;
     }
 
+/* Set height to keep alignment */
+/* Use H3 default font size or custom size if set */
+.no-subject .entry .entry-title {
+    height: 1.17em;
+    height: $*font_entry_title_size$*font_entry_title_units;
+    }
+
 .entry .contents { padding: .5em .5em 0 .5em; }
 
 .entry .contents .userpic {
@@ -206,7 +215,7 @@
     $entry_userpic_colors
     }
 
-.entry-content { margin: 1em 0; }
+.entry-content { margin: 1.5em 0; }
 
 .metadata { margin: 1em 0 0 0; }
 .metadata.top-metadata { margin-bottom: 2em; }
@@ -242,28 +251,26 @@
 .comment a:hover { color: $*color_entry_link_hover; }
 .comment a:active { color: $*color_entry_link_active; }
 
+.comment-title {
+    font-weight: bold;
+    padding: 0 0 .25em;
+    }
+
+/* Restore comment title color */
+.comment-title,
+.comment-title a {
+    color: $*color_comment_title;
+    }
+
 .partial .comment-title {
    display: inline;
    margin-right: .2em;
    }
 
-.partial .comment-title h4 {
-   display: inline;
-   }
-
 .partial .comment-poster:before {
    content: "- ";
    }
 
-.comment-title { margin: 0;
-    padding: 0 0 .25em 0;
-    font-weight: bold; }
-
-/* Restore comment title color */
-.comment-title, .comment-title a {
-    color: $*color_comment_title;
-    }
-
 .comment .contents { margin-top: .5em ; }
 
 .comment .poster-ip { font-size: small;
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/tranquilityiii/layout.s2
--- a/bin/upgrading/s2layers/tranquilityiii/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/tranquilityiii/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -300,10 +300,6 @@
    margin-right: .2em;
    }
 
-.partial .comment-title h4 {
-   display: inline;
-   }
-
 .partial .comment-poster:before {
    content: "- ";
    }
diff -r f8eb77eff62c -r 5cf363f75c85 bin/upgrading/s2layers/zesty/layout.s2
--- a/bin/upgrading/s2layers/zesty/layout.s2	Wed Apr 04 15:15:00 2012 +0800
+++ b/bin/upgrading/s2layers/zesty/layout.s2	Wed Apr 04 15:21:00 2012 +0800
@@ -727,11 +727,8 @@
 
 /* shared entry and comments */
 
-.comment-title h4 {
-    font-size: inherit;
-    font-weight: inherit;
+.comment-title {
     margin: 0;
-    padding: 0;
 }
 
 .tools {
--------------------------------------------------------------------------------
  • Add Memory
  • Share This Entry
(2 comments)

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

 
Notice: This account is set to log the IP addresses of everyone who comments.
Links will be displayed as unclickable URLs to help prevent spam.