diff --git a/core/themes/bartik/templates/block--system-menu-block.html.twig b/core/themes/bartik/templates/block--system-menu-block.html.twig
index 4bbab76914ce6bea350a7902402976b5b68dbf04..65ab19b11a49a1006d796c69999a7b419adc4729 100644
--- a/core/themes/bartik/templates/block--system-menu-block.html.twig
+++ b/core/themes/bartik/templates/block--system-menu-block.html.twig
@@ -12,16 +12,13 @@
{% block content %}
{# If a label is displayed, wrap it in
. #}
{% if configuration.label_display %}
-
+
{{ content }}
{% else %}
{# When rendering a menu without label, render a menu toggle. #}
- {% endif %}
- {{ content }}
- {% if configuration.label_display %}
-
+ {{ content }}
{% endif %}
{% endblock %}
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 0e402303f998df958c3fafacd6790882c311055a..22243e3d35a1454e1f3861a0cd5bf0047c23a152 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -74,68 +74,47 @@
]
%}
-
-
-
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index 5de50ccc0647f058f3ae700d7d92305e991660e4..5c2e9804453524fe19acface38b070992483cc40 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -8,38 +8,47 @@
* @see template_preprocess_maintenance_page()
*/
#}
-
-
-
-
-
-
-
- {% if title %}{{ title }}
{% endif %}
- {{ page.content }}
- {% if messages %}
-
+
+
+
+
+
+
+
+
+ {% if title %}
+ {{ title }}
+ {% endif %}
+ {{ page.content }}
+ {% if messages %}
+
+ {% endif %}
+
+
+
+
+
+
diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig
index 2e35f636e26e07f12ccdb8dd8f3ef9dc1a77b97b..b3906811e5053f23a9ec4ba73023b0da0636afcd 100644
--- a/core/themes/bartik/templates/node.html.twig
+++ b/core/themes/bartik/templates/node.html.twig
@@ -74,7 +74,6 @@
]
%}
-
-
{{ content|without('comment', 'links') }}
-
{% if content.links %}
-
- {{ content.links }}
-
+ {{ content.links }}
{% endif %}
-
{{ content.comment }}
-
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 2b34b1a0ac7339d90ed4c25fa7c231222a337652..ef758f24615cfcbdc7e9a46933061a52df2842f3 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -75,126 +75,122 @@
* @see html.html.twig
*/
#}
-
{{ title }}
+{{ title }}
{{ title_suffix }} {% endif %} -