diff --git a/core/modules/system/templates/datetime-wrapper.html.twig b/core/modules/system/templates/datetime-wrapper.html.twig index 45ba069..bce6533 100644 --- a/core/modules/system/templates/datetime-wrapper.html.twig +++ b/core/modules/system/templates/datetime-wrapper.html.twig @@ -26,5 +26,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 17ea820..7fa1154 100644 --- a/core/modules/system/templates/details.html.twig +++ b/core/modules/system/templates/details.html.twig @@ -21,7 +21,7 @@ {%- 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/themes/classy/templates/links.html.twig b/core/themes/classy/templates/links.html.twig new file mode 100644 index 0000000..56c7ec2 --- /dev/null +++ b/core/themes/classy/templates/links.html.twig @@ -0,0 +1,60 @@ +{# +/** + * @file + * Default theme implementation for a set of links. + * + * Available variables: + * - attributes: Attributes for the UL containing the list of links. + * - links: Links to be output. + * Each link will have the following elements: + * - title: The link text. + * - href: The link URL. If omitted, the 'title' is shown as a plain text + * item in the links list. If 'href' is supplied, the entire link is passed + * to l() as its $options parameter. + * - html: (optional) Whether or not 'title' is HTML. If set, the title will + * not be passed through \Drupal\Component\Utility\String::checkPlain(). + * - attributes: (optional) HTML attributes for the anchor, or for the + * tag if no 'href' is supplied. + * - link_key: The link CSS class. + * - heading: (optional) A heading to precede the links. + * - text: The heading text. + * - level: The heading level (e.g. 'h2', 'h3'). + * - attributes: (optional) A keyed list of attributes for the heading. + * If the heading is a string, it will be used as the text of the heading and + * the level will default to 'h2'. + * + * Headings should be used on navigation menus and any list of links that + * consistently appears on multiple pages. To make the heading invisible use + * the 'visually-hidden' CSS class. Do not use 'display:none', which + * removes it from screen readers and assistive technology. Headings allow + * screen reader and keyboard only users to navigate to or skip the links. + * See http://juicystudio.com/article/screen-readers-display-none.php and + * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information. + * + * @see template_preprocess_links() + * + * @ingroup themeable + */ +#} +{% if links -%} + {%- if heading -%} + {%- if heading.level -%} + <{{ heading.level }}{{ heading.attributes }}>{{ heading.text }} + {%- else -%} + {{ heading.text }} + {%- endif -%} + {%- endif -%} + + {%- for key, item in links -%} + + {%- if item.link -%} + {{ item.link }} + {%- elseif item.text_attributes -%} + {{ item.text }} + {%- else -%} + {{ item.text }} + {%- endif -%} + + {%- endfor -%} + +{%- endif %}