summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2013-08-18 07:17:51 (GMT)
committerwebchick2013-08-18 07:17:51 (GMT)
commit75644c155f2cadf56570effd87f4243d35a46c3c (patch)
treea550f0c5bd596c864af63015c353128c3e7edf9e
parentbb7404d3d295250dd26c30b7a9d4b2d08000e3e7 (diff)
Issue #1965650 by Pancho, mradcliffe, manningpete, rabbit_media, DeeLay: Fixed Comment rendering broken: comment body rendered outside of the bubble.
-rw-r--r--core/themes/bartik/css/style.css4
-rw-r--r--core/themes/bartik/templates/comment.html.twig53
2 files changed, 29 insertions, 28 deletions
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 2253074..dab43ff 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -859,6 +859,10 @@ ul.links {
border-right: 1px solid #fff4f4;
}
+.comment-footer {
+ display: table-row;
+}
+
/* ------------------ Sidebar ----------------- */
.sidebar .section {
padding-top: 10px;
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 2a8351c..2671268 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -66,7 +66,6 @@
<article class="{{ attributes.class }} clearfix"{{ attributes }} role="article">
<header class="comment-header">
-
<div class="attribution">
{{ user_picture }}
@@ -92,38 +91,36 @@
{% endif %}
</div>
</div> <!-- /.attribution -->
+ </header> <!-- /.comment-header -->
- <div class="comment-text">
- <div class="comment-arrow"></div>
-
- {% if new %}
- <span class="new">{{ new }}</span>
- {% endif %}
-
- {{ title_prefix }}
- <h3{{ title_attributes }}>{{ title }}</h3>
- {{ title_suffix }}
- </div> <!-- /.comment-text -->
+ <div class="comment-text">
+ <div class="comment-arrow"></div>
- </header> <!-- /.comment-header -->
+ {% if new %}
+ <span class="new">{{ new }}</span>
+ {% endif %}
- <div{{ content_attributes }}>
- {# We hide the links now so that we can render them later. #}
- {% hide(content.links) %}
- {{ content }}
+ {{ title_prefix }}
+ <h3{{ title_attributes }}>{{ title }}</h3>
+ {{ title_suffix }}
- </div> <!-- /.content -->
+ <div{{ content_attributes }}>
+ {# We hide the links now so that we can render them later. #}
+ {% hide(content.links) %}
+ {{ content }}
+ </div> <!-- /.content -->
- <footer class="comment-footer">
- {% if signature %}
- <div class="user-signature clearfix">
- {{ signature }}
- </div>
- {% endif %}
+ <footer class="comment-footer">
+ {% if signature %}
+ <div class="user-signature clearfix">
+ {{ signature }}
+ </div>
+ {% endif %}
- <nav>
- {{ content.links }}
- </nav>
- </footer> <!-- /.comment-footer -->
+ <nav>
+ {{ content.links }}
+ </nav>
+ </footer> <!-- /.comment-footer -->
+ </div> <!-- /.comment-text -->
</article>