diff --git a/packages/webawesome/docs/.eleventy.js b/packages/webawesome/docs/.eleventy.js index 213b86645..21cd9ee2f 100644 --- a/packages/webawesome/docs/.eleventy.js +++ b/packages/webawesome/docs/.eleventy.js @@ -76,7 +76,6 @@ export default async function (eleventyConfig) { // eleventyConfig.addGlobalData('package', packageData); eleventyConfig.addGlobalData('layout', 'page.njk'); - eleventyConfig.addGlobalData('pageType', 'docs'); // Default page type eleventyConfig.addGlobalData('server', { head: '', loginOrAvatar: '', @@ -94,6 +93,17 @@ export default async function (eleventyConfig) { return typeof content === 'string' ? content.replace(/^(\s|\|)/g, '').replace(/(\s|\|)$/g, '') : content; }); + /** + * @example + {% set foo = {foo: "bar"} %} + {% set bar = {bar: "baz"} %} + {% set merged = foo | merge(bar) %} + {{ merged | dump }} + */ + eleventyConfig.addFilter('merge', function (obj1, obj2) { + return Object.assign({}, obj1, obj2); + }); + // Custom filter to sort with a priority item first, e.g. // {{ collection | sortWithFirst('fileSlug', 'default') }} => the item with the fileSlug of 'default' will be first eleventyConfig.addFilter('sortWithFirst', function (collection, property, firstValue) { diff --git a/packages/webawesome/docs/_includes/base.njk b/packages/webawesome/docs/_includes/base.njk index d4976cff5..1e28d901f 100644 --- a/packages/webawesome/docs/_includes/base.njk +++ b/packages/webawesome/docs/_includes/base.njk @@ -15,16 +15,9 @@ {% if hasSidebar %}{% endif %} - {% if pageType == 'marketing' %} - {# Marketing styles #} - - {% else %} - {# Docs styles (default) #} + {% block head %} - {% endif %} - - - {% block head %}{% endblock %} + {% endblock %} - - - + + {% set defaultWaPageAttributes = defaultWaPageAttributes or { view: 'desktop', 'disable-navigation-toggle': true, 'mobile-breakpoint': 1180 } %} + {% set waPageAttributes = waPageAttributes or {} %} + {% set mergedWaPageAttributes = defaultWaPageAttributes | merge(waPageAttributes) %} + {% block pageHeader %}