diff --git a/core/modules/aggregator/templates/aggregator-feed.html.twig b/core/modules/aggregator/templates/aggregator-feed.html.twig
index 57f7d15..ee44c35 100644
--- a/core/modules/aggregator/templates/aggregator-feed.html.twig
+++ b/core/modules/aggregator/templates/aggregator-feed.html.twig
@@ -18,14 +18,10 @@
* @ingroup themeable
*/
#}
-
+{{ title_prefix }}
+{% if not full %}
+
{{ title }}
+{% endif %}
+{{ title_suffix }}
- {{ title_prefix }}
- {% if not full %}
- {{ title }}
- {% endif %}
- {{ title_suffix }}
-
- {{ content }}
-
-
+{{ content }}
diff --git a/core/modules/filter/templates/filter-tips.html.twig b/core/modules/filter/templates/filter-tips.html.twig
index b020c23..b9ed2d6 100644
--- a/core/modules/filter/templates/filter-tips.html.twig
+++ b/core/modules/filter/templates/filter-tips.html.twig
@@ -23,11 +23,8 @@
{% endif %}
{% if tips|length %}
- {% if multiple %}
-
- {% endif %}
-
{% for name, tip in tips %}
+
{% if multiple %}
{{ tip.name }}
@@ -44,9 +41,6 @@
{% if multiple %}
{% endif %}
- {% endfor %}
- {% if multiple %}
-
- {% endif %}
+ {% endfor %}
{% endif %}
diff --git a/core/modules/forum/templates/forums.html.twig b/core/modules/forum/templates/forums.html.twig
index ca40e32..5116c76 100644
--- a/core/modules/forum/templates/forums.html.twig
+++ b/core/modules/forum/templates/forums.html.twig
@@ -17,9 +17,7 @@
*/
#}
{% if forums_defined %}
-
- {{ forums }}
- {{ topics }}
- {{ topics_pager }}
-
+ {{ forums }}
+ {{ topics }}
+ {{ topics_pager }}
{% endif %}
diff --git a/core/modules/image/templates/image-widget.html.twig b/core/modules/image/templates/image-widget.html.twig
index 90b93db..966e905 100644
--- a/core/modules/image/templates/image-widget.html.twig
+++ b/core/modules/image/templates/image-widget.html.twig
@@ -14,12 +14,9 @@
#}
{% if data.preview %}
-
- {{ data.preview }}
-
+ {{ data.preview }}
{% endif %}
-
- {# Render widget data without the image preview that was output already. #}
- {{ data|without('preview') }}
-
+
+ {# Render widget data without the image preview that was output already. #}
+ {{ data|without('preview') }}
diff --git a/core/modules/link/templates/link-formatter-link-separate.html.twig b/core/modules/link/templates/link-formatter-link-separate.html.twig
index 4b58326..d0378e0 100644
--- a/core/modules/link/templates/link-formatter-link-separate.html.twig
+++ b/core/modules/link/templates/link-formatter-link-separate.html.twig
@@ -15,10 +15,8 @@
*/
#}
{% spaceless %}
-
- {% if title %}
-
{{ title }}
- {% endif %}
-
{{ link }}
-
+ {% if title %}
+ {{ title }}
+ {% endif %}
+ {{ link }}
{% endspaceless %}
diff --git a/core/modules/node/templates/node-edit-form.html.twig b/core/modules/node/templates/node-edit-form.html.twig
index 79f066c..fa455e6 100644
--- a/core/modules/node/templates/node-edit-form.html.twig
+++ b/core/modules/node/templates/node-edit-form.html.twig
@@ -17,6 +17,4 @@
* @ingroup themeable
*/
#}
-
- {{ form }}
-
+{{ form }}
diff --git a/core/modules/search/templates/search-result.html.twig b/core/modules/search/templates/search-result.html.twig
index 4847c9c..8982e90 100644
--- a/core/modules/search/templates/search-result.html.twig
+++ b/core/modules/search/templates/search-result.html.twig
@@ -63,11 +63,9 @@
{{ title }}
{{ title_suffix }}
-
- {% if snippet %}
-
{{ snippet }}
- {% endif %}
- {% if info %}
-
{{ info }}
- {% endif %}
-
+{% if snippet %}
+ {{ snippet }}
+{% endif %}
+{% if info %}
+ {{ info }}
+{% endif %}
diff --git a/core/modules/system/templates/block--system-branding-block.html.twig b/core/modules/system/templates/block--system-branding-block.html.twig
index 4c64251..9717abc 100644
--- a/core/modules/system/templates/block--system-branding-block.html.twig
+++ b/core/modules/system/templates/block--system-branding-block.html.twig
@@ -22,11 +22,9 @@
{% endif %}
{% if site_name %}
-
+ {{ site_name }}
{% endif %}
{% if site_slogan %}
- {{ site_slogan }}
+ {{ site_slogan }}
{% endif %}
{% endblock %}
diff --git a/core/modules/system/templates/datetime-wrapper.html.twig b/core/modules/system/templates/datetime-wrapper.html.twig
index 443b5b3..772c96e 100644
--- a/core/modules/system/templates/datetime-wrapper.html.twig
+++ b/core/modules/system/templates/datetime-wrapper.html.twig
@@ -25,5 +25,5 @@
{% endif %}
{{ content }}
{% if description %}
- {{ description }}
+ {{ description }}
{% endif %}
diff --git a/core/modules/system/templates/details.html.twig b/core/modules/system/templates/details.html.twig
index 42dd4c2..9e31665 100644
--- a/core/modules/system/templates/details.html.twig
+++ b/core/modules/system/templates/details.html.twig
@@ -19,15 +19,16 @@
{%- if title -%}
{{ title }}
{%- endif -%}
-
- {%- if description -%}
-
{{ description }}
- {%- endif -%}
- {%- if children -%}
- {{ children }}
- {%- endif -%}
- {%- if value -%}
- {{ value }}
- {%- endif -%}
-
+
+ {%- if description -%}
+ {{ description }}
+ {%- endif -%}
+
+ {%- if children -%}
+ {{ children }}
+ {%- endif -%}
+
+ {%- if value -%}
+ {{ value }}
+ {%- endif -%}
diff --git a/core/modules/system/templates/item-list.html.twig b/core/modules/system/templates/item-list.html.twig
index fdb151e..2cef1d0 100644
--- a/core/modules/system/templates/item-list.html.twig
+++ b/core/modules/system/templates/item-list.html.twig
@@ -19,18 +19,17 @@
*/
#}
{%- if items or empty -%}
-
- {%- if title is not empty -%}
-
{{ title }}
- {%- endif -%}
- {%- if items -%}
- <{{ list_type }}{{ attributes }}>
- {%- for item in items -%}
- {{ item.value }}
- {%- endfor -%}
- {{ list_type }}>
- {%- else -%}
- {{- empty -}}
- {%- endif -%}
-
+ {%- if title is not empty -%}
+ {{ title }}
+ {%- endif -%}
+
+ {%- if items -%}
+ <{{ list_type }}{{ attributes }}>
+ {%- for item in items -%}
+ {{ item.value }}
+ {%- endfor -%}
+ {{ list_type }}>
+ {%- else -%}
+ {{- empty -}}
+ {%- endif -%}
{%- endif %}
diff --git a/core/modules/system/templates/maintenance-page.html.twig b/core/modules/system/templates/maintenance-page.html.twig
index f270621..604196b 100644
--- a/core/modules/system/templates/maintenance-page.html.twig
+++ b/core/modules/system/templates/maintenance-page.html.twig
@@ -11,57 +11,50 @@
* @ingroup themeable
*/
#}
-
-
-
- {% if logo %}
-
-
-
- {% endif %}
-
- {% if site_name or site_slogan %}
-
- {% if site_name %}
-
- {% endif %}
+
+ {% if logo %}
+
+
+
+ {% endif %}
- {% if site_slogan %}
- {{ site_slogan }}
- {% endif %}
-
+ {% if site_name or site_slogan %}
+ {% if site_name %}
+
{% endif %}
-
-
-
- {% if title %}
- {{ title }}
+ {% if site_slogan %}
+ {{ site_slogan }}
{% endif %}
+ {% endif %}
+
- {{ page.messages }}
+
+ {% if title %}
+ {{ title }}
+ {% endif %}
- {{ page.content }}
-
+ {{ page.messages }}
- {% if page.sidebar_first %}
-
- {% endif %}
+ {{ page.content }}
+
- {% if page.sidebar_second %}
-
- {% endif %}
+{% if page.sidebar_first %}
+
+{% endif %}
- {% if page.footer %}
-
- {% endif %}
+{% if page.sidebar_second %}
+
+{% endif %}
-
+{% if page.footer %}
+
+{% endif %}
diff --git a/core/modules/system/templates/mark.html.twig b/core/modules/system/templates/mark.html.twig
index 1697de3..6da921a 100644
--- a/core/modules/system/templates/mark.html.twig
+++ b/core/modules/system/templates/mark.html.twig
@@ -15,8 +15,8 @@
#}
{% if logged_in %}
{% if status is constant('MARK_NEW') %}
- {{ 'new'|t }}
+ {{ 'new'|t }}
{% elseif status is constant('MARK_UPDATED') %}
- {{ 'updated'|t }}
+ {{ 'updated'|t }}
{% endif %}
{% endif %}
diff --git a/core/modules/taxonomy/templates/taxonomy-term.html.twig b/core/modules/taxonomy/templates/taxonomy-term.html.twig
index 750fd73..d6fb9bd 100644
--- a/core/modules/taxonomy/templates/taxonomy-term.html.twig
+++ b/core/modules/taxonomy/templates/taxonomy-term.html.twig
@@ -31,7 +31,5 @@
{% endif %}
{{ title_suffix }}
-
- {{ content }}
-
+ {{ content }}