Commit 534baf88 authored by Kevin Paxman's avatar Kevin Paxman
Browse files

Merge branch 'feature/ISTWCMS-5032-ebremner-catalog-search' into '1.0.x'

Feature/istwcms 5032 ebremner catalog search

See merge request !51
parents 0e07dd63 751cae6d
......@@ -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,
......
......@@ -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'
......
Markdown is supported
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