diff --git a/core/modules/comment/templates/comment.html.twig b/core/modules/comment/templates/comment.html.twig
index 3a7d19b..e8b0e1f 100644
--- a/core/modules/comment/templates/comment.html.twig
+++ b/core/modules/comment/templates/comment.html.twig
@@ -67,43 +67,36 @@
#}
- {% if title %}
- {{ title_prefix }}
- {% endif %}
-
{#
- Hide the "new" indicator by default, let a piece of JavaScript ask
- the server which comments are new for the user. Rendering the final
- "new" indicator here would break the render cache.
+ Hide the "new" indicator by default, let a piece of JavaScript ask the
+ server which comments are new for the user. Rendering the final "new"
+ indicator here would break the render cache.
#}
- {% if title %}
-
{{ title }}
- {{ title_suffix }}
- {% endif %}
-
-
-
+
- {{ content|without('links') }}
+ {% if title %}
+ {{ title_prefix }}
+
- {#
- // Indicate the semantic relationship between parent and child comments
- // for accessibility. The list is difficult to navigate in a screen
- // reader without this information.
- #}
- {% if parent %}
-
{{ parent }}
- {% endif %}
-
-
-
-
+ {#
+ Hide the "new" indicator by default, let a piece of JavaScript ask the
+ server which comments are new for the user. Rendering the final "new"
+ indicator here would break the render cache.
+ #}
+
+
+
+ {{ user_picture }}
+
{{ author }}
+
{{ created }}
+
{{ permalink }}
{#
- Hide the "new" indicator by default, let a piece of JavaScript ask
- the server which comments are new for the user. Rendering the final
- "new" indicator here would break the render cache.
+ Indicate the semantic relationship between parent and child comments
+ for accessibility. The list is difficult to navigate in a screen
+ reader without this information.
#}
-
+ {% if parent %}
+
diff --git a/core/themes/classy/templates/content/comment.html.twig b/core/themes/classy/templates/content/comment.html.twig
index 1d56d08..3dc5a2b 100644
--- a/core/themes/classy/templates/content/comment.html.twig
+++ b/core/themes/classy/templates/content/comment.html.twig
@@ -73,43 +73,36 @@
]
%}
- {% if title %}
- {{ title_prefix }}
- {% endif %}
-
{#
- Hide the "new" indicator by default, let a piece of JavaScript ask
- the server which comments are new for the user. Rendering the final
- "new" indicator here would break the render cache.
+ Hide the "new" indicator by default, let a piece of JavaScript ask the
+ server which comments are new for the user. Rendering the final "new"
+ indicator here would break the render cache.
#}
- {% if title %}
-
{{ title }}
- {{ title_suffix }}
- {% endif %}
-
-
-
+
- {{ content|without('links') }}
+ {% if title %}
+ {{ title_prefix }}
+
{{ author }}
-{{ created }}
-{{ permalink }}
- {# - // Indicate the semantic relationship between parent and child comments - // for accessibility. The list is difficult to navigate in a screen - // reader without this information. - #} - {% if parent %} -{{ parent }}
- {% endif %} -