From 9aaf24e2478307926f5b199e53104cbc0942d70f Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Fri, 28 Aug 2009 21:21:54 +0000 Subject: [PATCH] Fix story 1140047. Comment text wraps around commenter image. svn path=/plone.app.discussion/trunk/; revision=29457 --- plone/app/discussion/browser/comments.pt | 70 ++++++++++--------- .../browser/stylesheets/discussion.css | 26 +++++-- 2 files changed, 56 insertions(+), 40 deletions(-) diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt index ac39ed3..c99dde6 100644 --- a/plone/app/discussion/browser/comments.pt +++ b/plone/app/discussion/browser/comments.pt @@ -23,6 +23,7 @@
@@ -86,41 +87,44 @@ This is the body text of the comment.
- +
+ -
- -
+
+ +
- -
- - -
+ +
+ + +
+ +
diff --git a/plone/app/discussion/browser/stylesheets/discussion.css b/plone/app/discussion/browser/stylesheets/discussion.css index a20e7b9..ad23ac0 100644 --- a/plone/app/discussion/browser/stylesheets/discussion.css +++ b/plone/app/discussion/browser/stylesheets/discussion.css @@ -4,6 +4,7 @@ display: none; } + /* Comments Viewlet ---------------------------------------------------------------- */ @@ -15,19 +16,29 @@ .commentImage { width: 90px; float: left; - background: #EEF3F5; /* Todo: Only a temporary solution !!! */ + margin-right: -90px; } .commentImage img { margin-right: 1em; } -.comment h3, -.comment .documentByLine, -.comment .commentBody { - +.commentBody { + margin: 1em 0; } +.showCommenterImage h3, +.showCommenterImage .documentByLine, +.showCommenterImage .commentBody, +.showCommenterImage .commentActions, +.showCommenterImage .reply { + /* The showCommenterImage CSS class is only set if showing the + * commenters image is enabled. + */ + margin-left: 90px; +} + + /* Reply Form ---------------------------------------------------------------- */ @@ -37,8 +48,8 @@ } .reply-to-comment-button { - /* Hide the reply-to-comment button and show it only if Javascript is enabled. - * Since the reply functions rely on jQuery. + /* Hide the reply-to-comment button and show it only if Javascript + * is enabled. Since the reply functions rely on jQuery. */ display: none; } @@ -50,6 +61,7 @@ display: none; } + /* Moderation View ---------------------------------------------------------------- */