Commit 7b28cff5 authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch '1.0.x' into prod/1.0.x

parents a3c00c0a 6304af33
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.background{fill:#85bef4;}</style></defs><rect class="background" x="0.5" y="0.5" width="29" height="29"/><path d="M29,1V29H1V1H29m1-1H0V30H30V0Z"/><rect x="11.13" y="22.5" width="13.99" height="3" rx="0.75"/><rect x="11.13" y="16.51" width="13.99" height="3" rx="0.75"/><circle cx="7.13" cy="18.01" r="2.25"/><circle cx="7.13" cy="24" r="2.25"/><path d="M4.87,3.78H9.28c2.6,0,4.38,1.16,4.38,3.49v0c0,2.37-1.8,3.63-4.45,3.63H8.14v2.66H4.87ZM9,8.58c.84,0,1.4-.38,1.4-1.08v0c0-.72-.52-1.08-1.39-1.08h-.9V8.58Z"/><path d="M25.22,9.62l-.91-1.8A.29.29,0,0,0,24,7.66l-.89.12.39-1.07a.77.77,0,0,0,0-.54.68.68,0,0,0-.4-.36l-1-.36a.71.71,0,0,0-.9.42l-.54,1.49a2.52,2.52,0,0,0-5,.36l-.48-.06a.31.31,0,0,0-.3.16L14,9.62a.29.29,0,0,0,.18.41l.92.26v2.59a.55.55,0,0,0,.42.54l3.8,1a1.24,1.24,0,0,0,.55,0l3.8-1a.56.56,0,0,0,.43-.54V10.29L25,10a.29.29,0,0,0,.18-.41ZM22,6.29l.71.26L22.19,7.9l-.85.1ZM15.09,9.4l.42-.85,2.72.35-.72,1.2-2.42-.7Zm4.11,4.07L16,12.66V10.53l1.72.49a.27.27,0,0,0,.32-.13l1.19-2Zm.68-5.28-.25,0-3.09-.39a1.69,1.69,0,0,1,3.37.11A1.9,1.9,0,0,1,19.88,8.19Zm3.4,4.47-3.23.81V8.92l1.19,2a.29.29,0,0,0,.32.12l1.72-.49ZM21.74,10.1,21,8.9l2.72-.35.43.85Z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.background{fill:#85bef4;}</style></defs><rect class="background" x="0.5" y="0.5" width="29" height="29"/><path d="M29,1V29H1V1H29m1-1H0V30H30V0Z"/><path d="M26.19,10.92,24.38,7.3A.58.58,0,0,0,23.79,7L22,7.22l.78-2.13A1.4,1.4,0,0,0,22.74,4,1.42,1.42,0,0,0,22,3.28L20,2.57a1.41,1.41,0,0,0-1.81.84l-1.08,3a5,5,0,0,0-9.94.72L6.21,7a.58.58,0,0,0-.59.31L3.81,10.92a.56.56,0,0,0,.36.8L6,12.25v5.18a1.13,1.13,0,0,0,.85,1.09L8,18.8a7.43,7.43,0,0,1,.26-1.68L7.69,17V12.73l2.91.83a7.54,7.54,0,0,1,1.74-1.05l1.82-3V12a7.28,7.28,0,0,1,.93-.07,6,6,0,0,1,.75.06V9.51l1.77,2.92a7.62,7.62,0,0,1,1.48.75c.16.11.31.23.45.34l2.77-.79V17l-.38.09c.06.22.12.44.16.66a7.08,7.08,0,0,1,.11,1l.95-.23A1.13,1.13,0,0,0,24,17.43V12.25l1.83-.53A.56.56,0,0,0,26.19,10.92Zm-15.42.94L5.92,10.47l.85-1.71,5.45.7ZM15.51,8,15,8.11,8.83,7.33a3.37,3.37,0,0,1,6.73.22A2.63,2.63,0,0,1,15.51,8Zm4.17-3.79,1.43.52-1,2.69-1.69.21Zm-.45,7.61-1.45-2.4,5.45-.7.85,1.71Z"/><path d="M23.32,25.82l-3.58-3.58a5.62,5.62,0,1,0-1.49,1.49l3.58,3.58a.72.72,0,0,0,1,0l.49-.5A.69.69,0,0,0,23.32,25.82Zm-8.23-3.23a3.52,3.52,0,1,1,3.52-3.51A3.51,3.51,0,0,1,15.09,22.59Z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.background{fill:#85bef4;}</style></defs><rect class="background" x="0.5" y="0.5" width="29" height="29"/><path d="M29,1V29H1V1H29m1-1H0V30H30V0Z"/><path d="M26.19,14.43l-1.81-3.61a.58.58,0,0,0-.59-.32L22,10.73l.78-2.13a1.37,1.37,0,0,0-.05-1.07A1.42,1.42,0,0,0,22,6.8L20,6.09a1.41,1.41,0,0,0-1.81.84l-1.08,3a5,5,0,0,0-9.94.72l-1-.13a.58.58,0,0,0-.59.32L3.81,14.43a.58.58,0,0,0,.36.81L6,15.76v5.18A1.11,1.11,0,0,0,6.85,22l7.6,1.9a2.16,2.16,0,0,0,1.09,0L23.15,22A1.13,1.13,0,0,0,24,20.94V15.76l1.83-.52a.58.58,0,0,0,.36-.81ZM19.68,7.77l1.43.52-1,2.68-1.69.22ZM5.92,14l.85-1.71,5.45.69-1.45,2.4L5.92,14Zm8.24,8.13L7.69,20.5V16.25l3.44,1a.58.58,0,0,0,.65-.26L14.16,13Zm1.35-10.56-.51.07-6.17-.79a3.37,3.37,0,0,1,6.73.22A2.73,2.73,0,0,1,15.51,11.56Zm6.8,8.94-6.47,1.62V13L18.22,17a.58.58,0,0,0,.65.26l3.44-1Zm-3.08-5.13L17.78,13l5.45-.69L24.08,14Z"/></svg>
......@@ -28,7 +28,7 @@
{% if header_data %}
<div class="node--type-{{ node_type }}">
{% include '@components/card/card--node/card--node.twig' with {
{% include '@components/card/card--node/_card--node.twig' with {
'node': header_data,
'type': 'node',
'featured_image': featured_image,
......@@ -40,7 +40,7 @@
{% if footer_data %}
<div class="layout uw-contained-width">
{% include '@components/card/card--node/card--node.twig' with {
{% include '@components/card/card--node/_card--node.twig' with {
'node': footer_data,
'type': 'node',
} %}
......
{% include '@components/card/card--teaser/card--teaser.twig' with {
{% include '@components/card/card--teaser/_card--teaser.twig' with {
'teaser': teaser,
'type': 'teaser'
} %}
......@@ -94,7 +94,7 @@
{% block content %}
<div{{ content_attributes.addClass('node__content') }}>
{% include '@components/card/card--node/card--node.twig' with {
{% include '@components/card/card--node/_card--node.twig' with {
'node': node_data,
'type': 'node'
} %}
......
{% for data in node_data %}
<div class="views-row">
{% include '@components/card/card--teaser/card--teaser.twig' with {
{% include '@components/card/card--teaser/_card--teaser.twig' with {
'teaser': data,
} %}
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment