HTML/CSS: comment style changes

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 484335f9a02eea9319df1535086b5bfbb3901de0..2731331f8679beb1b3b7af1fc9288058dc974712 100644 (file)
--- 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 5a76d3ec1953e2004e321f066fdea25b403a701f..eadf712eb0432f6b681be73171a77ab067c29863 100644 (file)
--- 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 %}