diff --git a/core/modules/system/templates/details.html.twig b/core/modules/system/templates/details.html.twig index 17ea820..42dd4c2 100644 --- a/core/modules/system/templates/details.html.twig +++ b/core/modules/system/templates/details.html.twig @@ -19,9 +19,9 @@ {%- if title -%} {{ title }} {%- endif -%} -
+
{%- if description -%} -
{{ description }}
+
{{ description }}
{%- endif -%} {%- if children -%} {{ children }} diff --git a/core/modules/system/templates/dropbutton-wrapper.html.twig b/core/modules/system/templates/dropbutton-wrapper.html.twig index ca0ff7e..599c6d8 100644 --- a/core/modules/system/templates/dropbutton-wrapper.html.twig +++ b/core/modules/system/templates/dropbutton-wrapper.html.twig @@ -14,8 +14,8 @@ #} {% if children %} {% spaceless %} -
-
+
+
{{ children }}
diff --git a/core/modules/system/templates/feed-icon.html.twig b/core/modules/system/templates/feed-icon.html.twig index b3c10d1..a08628c 100644 --- a/core/modules/system/templates/feed-icon.html.twig +++ b/core/modules/system/templates/feed-icon.html.twig @@ -15,4 +15,4 @@ * @ingroup themeable */ #} -{{ icon }} +{{ icon }} diff --git a/core/modules/system/templates/field-multiple-value-form.html.twig b/core/modules/system/templates/field-multiple-value-form.html.twig index f18a853..e9370e9 100644 --- a/core/modules/system/templates/field-multiple-value-form.html.twig +++ b/core/modules/system/templates/field-multiple-value-form.html.twig @@ -20,13 +20,13 @@ */ #} {% if multiple %} -
+
{{ table }} {% if description %} -
{{ description }}
+
{{ description }}
{% endif %} {% if button %} -
{{ button }}
+
{{ button }}
{% endif %}
{% else %} diff --git a/core/modules/system/templates/field.html.twig b/core/modules/system/templates/field.html.twig index 5fcfd4f..c4cee6c 100644 --- a/core/modules/system/templates/field.html.twig +++ b/core/modules/system/templates/field.html.twig @@ -34,30 +34,14 @@ * @ingroup themeable */ #} -{% set field_name_class = field_name|clean_class %} -{% - set classes = [ - 'field', - 'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class, - 'field-name-' ~ field_name_class, - 'field-type-' ~ field_type|clean_class, - 'field-label-' ~ label_display, - label_display == 'inline' ? 'clearfix', - ] -%} -{% - set title_classes = [ - 'field-label', - label_display == 'visually_hidden' ? 'visually-hidden', - ] -%} - + +
{% if not label_hidden %} - {{ label }}
+ {{ label }}
{% endif %} - + {% for item in items %} - {{ item.content }}
+ {{ item.content }}
{% endfor %}
diff --git a/core/modules/system/templates/fieldset.html.twig b/core/modules/system/templates/fieldset.html.twig index ab6796c..1765135 100644 --- a/core/modules/system/templates/fieldset.html.twig +++ b/core/modules/system/templates/fieldset.html.twig @@ -21,27 +21,21 @@ * @ingroup themeable */ #} - - {% - set legend_span_classes = [ - 'fieldset-legend', - required ? 'form-required', - ] - %} +
{# Always wrap fieldset legends in a SPAN for CSS positioning. #} - {{ legend.title }} + {{ legend.title }} -
+
{% if prefix %} - {{ prefix }} + {{ prefix }} {% endif %} {{ children }} {% if suffix %} - {{ suffix }} + {{ suffix }} {% endif %} {% if description.content %} - {{ description.content }}
+ {{ description.content }}
{% endif %}
diff --git a/core/modules/system/templates/form-element-label.html.twig b/core/modules/system/templates/form-element-label.html.twig index 6ececd9..852e429 100644 --- a/core/modules/system/templates/form-element-label.html.twig +++ b/core/modules/system/templates/form-element-label.html.twig @@ -14,13 +14,7 @@ * @ingroup themeable */ #} -{% - set classes = [ - title_display == 'after' ? 'option', - title_display == 'invisible' ? 'visually-hidden', - required ? 'form-required', - ] -%} + {% if title is not empty or required -%} - {{ title }} + {{ title }} {%- endif %} diff --git a/core/modules/system/templates/details.html.twig b/core/themes/classy/templates/details.html.twig similarity index 100% copy from core/modules/system/templates/details.html.twig copy to core/themes/classy/templates/details.html.twig diff --git a/core/modules/system/templates/dropbutton-wrapper.html.twig b/core/themes/classy/templates/dropbutton-wrapper.html.twig similarity index 100% copy from core/modules/system/templates/dropbutton-wrapper.html.twig copy to core/themes/classy/templates/dropbutton-wrapper.html.twig diff --git a/core/modules/system/templates/feed-icon.html.twig b/core/themes/classy/templates/feed-icon.html.twig similarity index 100% copy from core/modules/system/templates/feed-icon.html.twig copy to core/themes/classy/templates/feed-icon.html.twig diff --git a/core/modules/system/templates/field-multiple-value-form.html.twig b/core/themes/classy/templates/field-multiple-value-form.html.twig similarity index 100% copy from core/modules/system/templates/field-multiple-value-form.html.twig copy to core/themes/classy/templates/field-multiple-value-form.html.twig diff --git a/core/modules/system/templates/field.html.twig b/core/themes/classy/templates/field.html.twig similarity index 100% copy from core/modules/system/templates/field.html.twig copy to core/themes/classy/templates/field.html.twig diff --git a/core/modules/system/templates/fieldset.html.twig b/core/themes/classy/templates/fieldset.html.twig similarity index 100% copy from core/modules/system/templates/fieldset.html.twig copy to core/themes/classy/templates/fieldset.html.twig diff --git a/core/modules/system/templates/form-element-label.html.twig b/core/themes/classy/templates/form-element-label.html.twig similarity index 100% copy from core/modules/system/templates/form-element-label.html.twig copy to core/themes/classy/templates/form-element-label.html.twig