Commit 6c15554e authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents 7fc3d4da 5f710bf1
......@@ -37,16 +37,18 @@
{{ attach_library('uw_theme_admin/uw_layout_builder') }}
{% endif %}
<div{{ attributes.addClass(classes) }}>
{% if admin_label %}
<div class="uw-admin-label">{{ admin_label }}</div>
{% endif %}
{{ title_prefix }}
{% if label %}
<h2{{ title_attributes }}>{{ label }}</h2>
{% endif %}
{{ title_suffix }}
{% block content %}
{{ content }}
{% endblock %}
</div>
{% if content %}
<div{{ attributes.addClass(classes) }}>
{% if admin_label %}
<div class="uw-admin-label">{{ admin_label }}</div>
{% endif %}
{{ title_prefix }}
{% if label %}
<h2{{ title_attributes }}>{{ label }}</h2>
{% endif %}
{{ title_suffix }}
{% block content %}
{{ content }}
{% endblock %}
</div>
{% endif %}
{% if (view.current_display == 'catalog_a_z_page') %}
<div class="views-element-container contextual-region">
{% endif %}
{% include '@components/tabs/tabs--link/tabs--link.twig' with {
'content_list': content_list,
'tabs_modifier_class': 'catalog'
} %}
{% if catalog_search %}
{% include '@components/catalog-search/catalog-search.twig' with {
'catalog_search': catalog_search
} %}
{% endif %}
{% include '@components/view/views-view/views-view.twig' with {
'title_prefix': title_prefix,
'title': title,
......@@ -15,3 +26,7 @@
'more': more,
'feed_icons': feed_icons,
} %}
{% if (view.current_display == 'catalog_a_z_page') %}
</div>
{% endif %}
......@@ -2,6 +2,12 @@
'content_list': content_list,
} %}
{% if catalog_search %}
{% include '@components/catalog-search/catalog-search.twig' with {
'catalog_search': catalog_search
} %}
{% endif %}
{% include '@components/view/views-view/views-view.twig' with {
'title_prefix': title_prefix,
'title': title,
......
......@@ -40,6 +40,12 @@
]
%}
{% if catalog_search %}
{% include '@components/catalog-search/catalog-search.twig' with {
'catalog_search': catalog_search
} %}
{% endif %}
{% include '@components/view/views-view/views-view.twig' with {
'attributes': attributes,
'css_name': css_name,
......
......@@ -39,6 +39,8 @@ stylesheets-remove:
- 'core/themes/seven/css/base/elements.css'
- 'core/themes/seven/css/components/pager.css'
- 'core/themes/seven/css/classy/components/pager.css'
- 'core/themes/seven/css/classy/components/form.css'
- 'core/themes/seven/css/components/form.css'
# - '@stable/css/system/components/align.module.css'
# - '@stable/css/system/components/fieldgroup.module.css'
# - '@stable/css/system/components/container-inline.module.css'
......
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