aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJef van Schendel <mail@jefvanschendel.nl>2012-04-01 17:22:37 +0200
committerJef van Schendel <mail@jefvanschendel.nl>2012-04-01 17:22:37 +0200
commit55dbaa9b77cb83f5afa72845d7dc5749aa3c21c8 (patch)
treed99bb9abe678b63a4628813140859829785ae849
parentff2e9dc0d61f183732a22d38141a0074fcf7a1e6 (diff)
downloadmediagoblin-55dbaa9b77cb83f5afa72845d7dc5749aa3c21c8.tar.lz
mediagoblin-55dbaa9b77cb83f5afa72845d7dc5749aa3c21c8.tar.xz
mediagoblin-55dbaa9b77cb83f5afa72845d7dc5749aa3c21c8.zip
HTML/CSS: comment style changes
-rw-r--r--mediagoblin/static/css/base.css11
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html12
2 files changed, 15 insertions, 8 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 484335f9..2731331f 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -356,16 +356,21 @@ textarea#description, textarea#bio {
/* comments */
.comment_author {
- margin-bottom: 40px;
padding-top: 4px;
font-size: 0.9em;
}
.comment_content {
- margin-bottom: 30px;
+ margin-left: 8px;
+ margin-top: 8px;
+}
+
+.comment_wrapper {
+ margin-top: 14px;
+ margin-bottom: 14px;
}
-.comment_content p {
+.comment_wrapper p {
margin-bottom: 0px;
}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 5a76d3ec..eadf712e 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -143,10 +143,7 @@
{% else %}
<div class="comment_wrapper" id="comment-{{ comment._id }}">
{% endif %}
- <div class="comment_content">
- {% autoescape False %}
- {{ comment.content_html }}
- {% endautoescape %}
+ <div class="comment_author">
<img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user = comment_author.username) }}">
@@ -158,7 +155,12 @@
user = media.get_uploader.username,
media = media.slug_or_id) }}#comment">
{{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
- </a>
+ </a>:
+ </div>
+ <div class="comment_content">
+ {% autoescape False %}
+ {{ comment.content_html }}
+ {% endautoescape %}
</div>
</div>
{% endfor %}