Commit e3f346e7 authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents 25747d1f 613d579c
<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.66A4.78,4.78,0,0,1,13.19,4.9a3.1,3.1,0,0,1,.89,2.32v0a3.18,3.18,0,0,1-1.93,3l2.28,3.33H10.69l-1.85-2.8h-.7v2.8H4.87ZM9.56,8.44c.78,0,1.26-.35,1.26-.95v0c0-.63-.49-.94-1.25-.94H8.14V8.44Z"/></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="M13.77,20.89a7.12,7.12,0,0,1-1.62-1.52H10.62V10.62h1.54a7.12,7.12,0,0,1,3.46-2.41v-2c0-.69-.55-1.25-1.56-1.25H4.69a1.25,1.25,0,0,0-.94,1.25v17.5A1.25,1.25,0,0,0,4.69,25h9.37c1,0,1.56-.56,1.56-1.25v-2A7.2,7.2,0,0,1,13.77,20.89Zm-3.15-14h3.13V8.75H10.62ZM8.75,23.12H5.62V21.25H8.75Zm0-3.75H5.62V10.62H8.75Zm0-10.62H5.62V6.88H8.75Zm5,14.37H10.62V21.25h3.13Z"/><path d="M26,21.86l-3.58-3.57a5.62,5.62,0,1,0-1.49,1.49l3.58,3.58a.72.72,0,0,0,1,0l.49-.5A.7.7,0,0,0,26,21.86Zm-8.23-3.22a3.52,3.52,0,1,1,3.52-3.52A3.51,3.51,0,0,1,17.77,18.64Z"/></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.23,22.76,21.66,5.46A.62.62,0,0,0,20.9,5l-.61.16a.63.63,0,0,0-.46.65,10.07,10.07,0,0,1-3,.81.62.62,0,0,0-.72-.32l-.45.11V6.25c0-.69-.55-1.25-1.56-1.25H4.69a1.25,1.25,0,0,0-.94,1.25v17.5A1.25,1.25,0,0,0,4.69,25h9.37c1,0,1.56-.56,1.56-1.25V9.53l4,15a.62.62,0,0,0,.76.44l.61-.16a.63.63,0,0,0,.46-.65,10.07,10.07,0,0,1,3-.81.62.62,0,0,0,.72.32l.61-.16a.62.62,0,0,0,.44-.76Zm-17.48.36H5.62V21.25H8.75Zm0-3.75H5.62V10.63H8.75Zm0-10.62H5.62V6.88H8.75Zm5,14.37H10.62V21.25h3.13Zm0-3.75H10.62V10.63h3.13Zm0-10.62H10.62V6.88h3.13ZM21,22.62,17.22,8.19a15.37,15.37,0,0,0,3-.81L24,21.81a15.37,15.37,0,0,0-3,.81Z"/></svg>
......@@ -30,6 +30,7 @@
* @see template_preprocess_views_view()
*/
#}
{%
set classes = [
'view',
......@@ -56,6 +57,10 @@
} %}
{% endif %}
{% if not show_empty %}
{% set show_empty = 'yes' %}
{% endif %}
{% include '@components/view/views-view/views-view.twig' with {
'attributes': attributes,
'css_name': css_name,
......@@ -64,6 +69,7 @@
'footer': footer,
'rows': rows,
'empty': empty.area,
'show_empty': show_empty,
'pager': pager,
'exposed': exposed,
'feed_icons': feed_icons,
......
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