diff --git a/lib/area.js b/lib/area.js deleted file mode 100644 index 584365fb..00000000 --- a/lib/area.js +++ /dev/null @@ -1,6 +0,0 @@ -export default { - '@apostrophecms/image': {}, - '@apostrophecms/video': {}, - '@apostrophecms/html': {}, - '@apostrophecms/rich-text': {} -}; diff --git a/modules/@apostrophecms/home-page/index.js b/modules/@apostrophecms/home-page/index.js index 29664d44..28ded53a 100644 --- a/modules/@apostrophecms/home-page/index.js +++ b/modules/@apostrophecms/home-page/index.js @@ -8,6 +8,12 @@ export default { type: 'area', options: { widgets: { + '@apostrophecms/layout': { + columns: 6, + defaultSpan: 3, + minSpan: 1, + gap: '1rem' + }, '@apostrophecms/rich-text': {}, '@apostrophecms/image': {}, '@apostrophecms/video': {} diff --git a/modules/@apostrophecms/layout-column-widget/index.js b/modules/@apostrophecms/layout-column-widget/index.js new file mode 100644 index 00000000..f112d6a8 --- /dev/null +++ b/modules/@apostrophecms/layout-column-widget/index.js @@ -0,0 +1,18 @@ +// Modify the layout column widget to allow the desired content types +// in the Layout widget. +export default { + fields: { + add: { + content: { + type: 'area', + options: { + widgets: { + '@apostrophecms/rich-text': {}, + '@apostrophecms/image': {}, + '@apostrophecms/video': {} + } + } + } + } + } +}; diff --git a/modules/asset/ui/src/scss/_layout.scss b/modules/asset/ui/src/scss/_layout.scss index 95d9e685..1a90df37 100644 --- a/modules/asset/ui/src/scss/_layout.scss +++ b/modules/asset/ui/src/scss/_layout.scss @@ -22,7 +22,7 @@ body { main, .bp-footer { width: 100%; - max-width: 800px; + max-width: 1200px; margin-left: auto; margin-right: auto; } diff --git a/modules/default-page/index.js b/modules/default-page/index.js index abb52d41..283c71be 100644 --- a/modules/default-page/index.js +++ b/modules/default-page/index.js @@ -6,6 +6,14 @@ export default { fields: { add: { main: { + type: 'area', + options: { + widgets: { + '@apostrophecms/layout': {}, + } + } + }, + content: { type: 'area', options: { widgets: { @@ -14,14 +22,15 @@ export default { '@apostrophecms/video': {} } } - } + }, }, group: { basics: { label: 'Basics', fields: [ 'title', - 'main' + 'main', + 'content' ] } } diff --git a/modules/default-page/views/page.html b/modules/default-page/views/page.html index a5925703..33247120 100644 --- a/modules/default-page/views/page.html +++ b/modules/default-page/views/page.html @@ -6,8 +6,11 @@ {% extends "layout.html" %} {% block main %} -
-

{{ data.page.title }}

+

{{ data.page.title }}

+
{% area data.page, 'main' %}
+
+ {% area data.page, 'content' %} +
{% endblock %}