diff --git a/.ahoy.yml b/.ahoy.yml
index d2bb51377..38450ea24 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -15,6 +15,7 @@ commands:
build:
usage: Build project locally (single-local architecture only).
cmd: |
+ set -e
cat .env | grep -v "#" | grep -v -e '^$'
if [ "$1" == "y" ]; then
env $(cat .env | grep -v "#" | xargs) docker buildx bake -f docker-compose.yml --no-cache cli --load
@@ -105,7 +106,7 @@ commands:
test-phpunit:
usage: Run PHPUnit tests.
- cmd: docker compose exec cli phpunit --testsuite govcms
+ cmd: docker compose exec test phpunit --testsuite govcms
test-redis:
usage: Verify redis can accept connections.
diff --git a/.docker/Dockerfile.govcms b/.docker/Dockerfile.govcms
index f775772ee..f3a8dde4d 100644
--- a/.docker/Dockerfile.govcms
+++ b/.docker/Dockerfile.govcms
@@ -11,9 +11,6 @@ ARG GOVCMS_PROJECT_VERSION
COPY composer.* /app/
-# Copy base file for extensible saas.
-COPY custom /app/custom
-
# Install yq for YAML parsing.
RUN case $(uname -m) in x86_64) ARCH="amd64" ;; aarch64) ARCH="arm64" ;; *) ARCH="amd64" ;; esac \
&& wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/2.4.0/yq_linux_${ARCH}" \
diff --git a/.env.default b/.env.default
index 4bf5b0830..36571a735 100644
--- a/.env.default
+++ b/.env.default
@@ -35,7 +35,7 @@ X_FRAME_OPTIONS=SAMEORIGIN
# Set the version of GovCMS and Drupal Core to use - you can use a tag or branch reference (3.x-dev) here
# See https://github.com/govCMS/GovCMS/releases
-GOVCMS_PROJECT_VERSION=4.2.0
+GOVCMS_PROJECT_VERSION=dev-4.x-develop
# Set the Lagoon tag to use for the upstream dockerfiles (e.g. 20.12.0)
# See https://github.com/uselagoon/lagoon-images/releases
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..84fbaaf68
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,67 @@
+name: Build
+
+on:
+ pull_request:
+
+jobs:
+ build:
+ name: Build
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v3
+ with:
+ driver: docker
+
+ - name: Install Ahoy
+ run: |
+ sudo wget -q https://github.com/ahoy-cli/ahoy/releases/download/v2.1.1/ahoy-bin-linux-amd64 -O /usr/local/bin/ahoy
+ sudo chmod +x /usr/local/bin/ahoy
+
+ - name: Create Docker network
+ run: docker network create amazeeio-network || true
+
+ - name: Build
+ env:
+ COMPOSER_AUTH: ""
+ DOCKER_BUILDKIT: 1
+ run: |
+ cp .env.default .env
+ sed -i 's/GOVCMS_RELEASE_TAG=.*/GOVCMS_RELEASE_TAG=ci-test/' .env
+ ahoy build y
+
+ - name: Stop lagoon containers
+ run: docker compose down -v --remove-orphans
+
+ - name: Clone and init scaffold
+ run: |
+ git clone --depth 1 -b develop https://github.com/govCMS/scaffold.git /tmp/scaffold
+ cd /tmp/scaffold
+ ahoy init govcms saas 11
+
+ - name: Configure scaffold for CI
+ working-directory: /tmp/scaffold
+ run: |
+ sed -i 's/GOVCMS_IMAGE_VERSION=.*/GOVCMS_IMAGE_VERSION=ci-test/' .env
+ sed -i '/volumes_from:/d; /amazeeio-ssh-agent/d' docker-compose.yml
+
+ - name: Build scaffold
+ working-directory: /tmp/scaffold
+ run: ahoy build
+
+ - name: Install site
+ working-directory: /tmp/scaffold
+ run: docker compose exec -T cli drush si -y govcms --account-pass=admin
+
+ - name: Check homepage
+ working-directory: /tmp/scaffold
+ run: |
+ STATUS=$(docker compose exec -T test curl -s -o /dev/null -w "%{http_code}" http://nginx:8080)
+ echo "Homepage returned HTTP ${STATUS}"
+ if [ "${STATUS}" != "200" ]; then
+ echo "::error::Homepage returned HTTP ${STATUS}, expected 200"
+ docker compose exec -T test curl -s http://nginx:8080 | head -50
+ exit 1
+ fi
diff --git a/.gitignore b/.gitignore
index fd6143cad..cde5d48b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.env
auth.json
+.claude
diff --git a/composer.json b/composer.json
index 00fc336b1..f57a7c28e 100644
--- a/composer.json
+++ b/composer.json
@@ -7,17 +7,12 @@
{
"type": "composer",
"url": "https://packages.drupal.org/8"
- },
- {
- "type": "path",
- "url": "custom/composer"
}
],
"require": {
"composer/installers": "^2.0",
"cweagans/composer-patches": "^1.7",
"govcms/govcms": "dev-4.x-develop",
- "govcms/govcms-custom": "*",
"govcms/scaffold-tooling": "6.0.5"
},
"require-dev": {
@@ -57,8 +52,7 @@
"DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
],
"post-install-cmd": [
- "DrupalProject\\composer\\ScriptHandler::createRequiredFiles",
- "DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
+ "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
],
"post-update-cmd": [
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
@@ -69,7 +63,6 @@
"drupal/core": "-p2"
},
"enable-patching": true,
- "patches-file": "custom/composer/patches.json",
"installer-types": [],
"drupal-scaffold": {
"locations": {
diff --git a/custom/composer/composer.json b/custom/composer/composer.json
deleted file mode 100644
index 5a6f9d6e3..000000000
--- a/custom/composer/composer.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "govcms/govcms-custom",
- "description": "Provides additional packages over the GovCMS base distribution.",
- "require": {
- }
-}
diff --git a/custom/composer/patches.json b/custom/composer/patches.json
deleted file mode 100644
index b7805831b..000000000
--- a/custom/composer/patches.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "patches": {
- }
-}
diff --git a/modules/README.md b/modules/README.md
deleted file mode 100644
index 1c976feda..000000000
--- a/modules/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## 10.x compatibility note.
-
-Several placeholder modules and themes are shipped in this folder that are not yet ready for D10, or are deprecated from the distribution and only provided here temporarily to provide an upgrade pathway.
-
-Where modules can be patched they will be pre-patched here. Any patches applied (other than updating the `core_version_requirement` value) will be shipped in the relevant module directory.
-
-Modules that haven no viable D10 release (e.g no patches yet exist) will have stub modules created in the `stubs` folder.
-
-### Distribution modules
-* `panelizer`: Has 4.x-dev branch in place.
-* `govcms8_layouts`: Provides display mode templates still depended on for many sites.
-* `ckeditor`: Provides ckeditor4 for backwards compatibility.
-* `aggregator`: Provides the module previously found in core for backwards compatibility.
-* `video_embed_field`: Provides the deprecated module for backwards compatibility while ckeditor4 remains supported.
diff --git a/modules/distro/.DS_Store b/modules/distro/.DS_Store
deleted file mode 100644
index 5008ddfcf..000000000
Binary files a/modules/distro/.DS_Store and /dev/null differ
diff --git a/modules/distro/govcms8_foundations/README.md b/modules/distro/govcms8_foundations/README.md
deleted file mode 100644
index 8b3137ce5..000000000
--- a/modules/distro/govcms8_foundations/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# GovCMS8 Foundations
-
-The GovCMS8 Foundations module is used to store shared configuration and define dependencies.
diff --git a/modules/distro/govcms8_foundations/govcms8_foundations.info.yml b/modules/distro/govcms8_foundations/govcms8_foundations.info.yml
deleted file mode 100644
index 18f4f1b42..000000000
--- a/modules/distro/govcms8_foundations/govcms8_foundations.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'GovCMS8 Foundations'
-type: module
-description: 'GovCMS8 Foundations Module. [obsolete]'
-package: GovCMS [obsolete]
-core_version_requirement: ^9 || ^10
-lifecycle: obsolete
-lifecycle_link: 'https://github.com/GovCMS/GovCMS'
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/README.md b/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/README.md
deleted file mode 100644
index 3e8c98f98..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# GovCMS 8 Calendar Item
-
-This module ships a custom field formatter and Display Suite field to render a custom calendar item markup on the calendar item view mode.
\ No newline at end of file
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/govcms8_calendar_item.info.yml b/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/govcms8_calendar_item.info.yml
deleted file mode 100644
index fb55d614b..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/govcms8_calendar_item.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'GovCMS8 Calendar Item'
-type: module
-description: 'Provides custom calendar item formatter and DS field for UI-Kit. [obsolete]'
-package: GovCMS [obsolete]
-core_version_requirement: ^9 || ^10
-lifecycle: obsolete
-lifecycle_link: 'https://github.com/GovCMS/GovCMS'
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/govcms8_calendar_item.libraries.yml b/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/govcms8_calendar_item.libraries.yml
deleted file mode 100644
index d483a703f..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/govcms8_calendar_item.libraries.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-calendar_item:
- js:
- js/calendar_item.js: {}
- dependencies:
- - core/jquery
- - core/jquery.once
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/govcms8_calendar_item.module b/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/govcms8_calendar_item.module
deleted file mode 100644
index d807436b7..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/govcms8_calendar_item.module
+++ /dev/null
@@ -1,35 +0,0 @@
- [
- 'variables' => [
- 'datetime' => [],
- ],
- 'template' => 'calendar_item_date',
- ],
- ];
-}
-
-/**
- * Implements hook_preprocess_HOOK().
- */
-function govcms8_calendar_item_preprocess_calendar_item_date(&$variables) {
- $item = $variables['datetime'];
- if (!empty($item) && $item instanceof DrupalDateTime) {
- $variables['datetime'] = $item->format('Y-m-d');
- $variables['day_textual'] = $item->format('D');
- $variables['day_number'] = $item->format('d');
- $variables['month'] = $item->format('M');
- }
-}
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/js/calendar_item.js b/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/js/calendar_item.js
deleted file mode 100644
index 47273f2e5..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/js/calendar_item.js
+++ /dev/null
@@ -1,28 +0,0 @@
-(function ($, Drupal, drupalSettings) {
- /**
- * Add current or past class to events.
- */
- Drupal.behaviors.calendarItemCurrentDate = {
- attach: function attach(context) {
- $('time.calendar-date', context).once('calendar-date').each(function () {
- var $calendarDate = $(this);
- var dateTime = $calendarDate.attr('datetime');
- if (dateTime !== null) {
- // Set the time to 0, we only want to compare
- var today = new Date().setHours(0, 0, 0, 0);
- var eventDate = new Date(dateTime).setHours(0, 0, 0, 0);
-
- // If event date is less than today.
- if (eventDate < today) {
- $calendarDate.closest('.calendar-item').addClass('calendar-item--past');
- }
- // If event date is today.
- if (eventDate === today) {
- $calendarDate.closest('.calendar-item').addClass('calendar-item--current');
- }
- }
- });
- }
- };
-
-})(jQuery, Drupal, drupalSettings);
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/src/Plugin/DsField/CalendarItemDate.php b/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/src/Plugin/DsField/CalendarItemDate.php
deleted file mode 100644
index c36c7a85d..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/src/Plugin/DsField/CalendarItemDate.php
+++ /dev/null
@@ -1,90 +0,0 @@
-getConfiguration();
-
- $form['date field'] = [
- '#type' => 'textfield',
- '#title' => 'Field',
- '#default_value' => $config['date field'],
- ];
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function settingsSummary($settings) {
- $config = $this->getConfiguration();
-
- $summary = [];
- $summary[] = 'Field: ' . $config['date field'];
-
- return $summary;
- }
-
- /**
- * {@inheritdoc}
- */
- public function defaultConfiguration() {
-
- $configuration = [
- 'date field' => 'created',
- ];
-
- return $configuration;
- }
-
- /**
- * {@inheritdoc}
- */
- public function build() {
- $build = [];
- $config = $this->getConfiguration();
- $datetime = [];
-
- $date_field = $config['date field'];
- if (!empty($date_field) && $this->entity()->hasField($date_field)) {
- $field = $this->entity()->get($date_field)->value;
- $timestamp = strtotime($field);
- if ($timestamp > 0) {
- $datetime = DrupalDateTime::createFromTimestamp($timestamp);
- }
- else {
- $datetime = DrupalDateTime::createFromTimestamp($field);
- }
- $build = [
- '#theme' => 'calendar_item_date',
- '#datetime' => $datetime,
- '#attached' => [
- 'library' => [
- 'govcms8_calendar_item/calendar_item',
- ],
- ],
- ];
- }
- return $build;
- }
-
-}
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/src/Plugin/Field/FieldFormatter/CalendarItemDateFormatter.php b/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/src/Plugin/Field/FieldFormatter/CalendarItemDateFormatter.php
deleted file mode 100644
index c57899153..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/src/Plugin/Field/FieldFormatter/CalendarItemDateFormatter.php
+++ /dev/null
@@ -1,65 +0,0 @@
- $item) {
- $elements[$delta] = $this->viewValue($item);
- }
-
- return $elements;
- }
-
- /**
- * Generate the output appropriate for one field item.
- *
- * @param \Drupal\Core\Field\FieldItemInterface $item
- * One field item.
- *
- * @return array
- * The textual output generated.
- */
- protected function viewValue(FieldItemInterface $item) {
- $field = $item->getFieldDefinition();
- if ($field->get('field_type') == 'daterange') {
- $value = $item->start_date;
- }
- else {
- $value = $item->date;
- }
- $build = [
- '#theme' => 'calendar_item_date',
- '#datetime' => $value,
- '#attached' => [
- 'library' => [
- 'govcms8_calendar_item/calendar_item',
- ],
- ],
- ];
- return $build;
- }
-
-}
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/templates/calendar_item_date.html.twig b/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/templates/calendar_item_date.html.twig
deleted file mode 100644
index 41ccab35e..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_calendar_item/templates/calendar_item_date.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{#
-/**
-* Field template used by the Calendar Item Date Formatter.
-*/
-#}
-{% set classes = [
- "calendar-date"
-]
-%}
-
-{% if datetime %}
-
-{% endif %}
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/README.md b/modules/distro/govcms8_foundations/modules/govcms8_layouts/README.md
deleted file mode 100644
index 028ce8b18..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_layouts/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# GovCMS8 Layouts
-
-The "GovCMS8 Layouts" module is used to ship layouts for GovCMS.
-
-These layouts are for content types and view modes.
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/govcms8_layouts.info.yml b/modules/distro/govcms8_foundations/modules/govcms8_layouts/govcms8_layouts.info.yml
deleted file mode 100644
index 30ab1f385..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_layouts/govcms8_layouts.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'GovCMS8 Layouts'
-type: module
-description: 'Provides layouts for the GovCMS8 distribution. [obsolete]'
-package: GovCMS [obsolete]
-core_version_requirement: ^9 || ^10
-lifecycle: obsolete
-lifecycle_link: 'https://github.com/GovCMS/GovCMS'
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/govcms8_layouts.layouts.yml b/modules/distro/govcms8_foundations/modules/govcms8_layouts/govcms8_layouts.layouts.yml
deleted file mode 100644
index 8d35e71cd..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_layouts/govcms8_layouts.layouts.yml
+++ /dev/null
@@ -1,200 +0,0 @@
-####
-# Page layouts
-####
-page_12_12:
- label: Stacked
- category: "GovCMS: Page"
- template: templates/page_layouts/page_12_12
- icon: templates/page_layouts/images/page_12_12.png
- regions:
- header:
- label: Header
- content_top:
- label: Content top
- content:
- label: Content
- sidebar:
- label: Sidebar
- content_bottom:
- label: Content bottom
- footer:
- label: Footer
-page_edgy:
- label: Edge to edge
- category: "GovCMS: Page"
- template: templates/page_layouts/page_edgy
- icon: templates/page_layouts/images/page_edgy.png
- regions:
- header:
- label: Header
- content_top:
- label: Content top
- content:
- label: Content
- content_bottom:
- label: Content bottom
- footer:
- label: Footer
-page_6_6:
- label: Two columns (1:1)
- category: "GovCMS: Page"
- template: templates/page_layouts/page_6_6
- icon: templates/page_layouts/images/page_6_6.png
- regions:
- header:
- label: Header
- content_top:
- label: Content top
- content:
- label: Content
- sidebar:
- label: Sidebar
- content_bottom:
- label: Content bottom
- footer:
- label: Footer
-page_8_4:
- label: Sidebar Right (2:1)
- category: "GovCMS: Page"
- template: templates/page_layouts/page_8_4
- icon: templates/page_layouts/images/page_8_4.png
- regions:
- header:
- label: Header
- content_top:
- label: Content top
- content:
- label: Content
- sidebar:
- label: Sidebar
- content_bottom:
- label: Content bottom
- footer:
- label: Footer
-page_4_8:
- label: Sidebar Left (1:2)
- category: "GovCMS: Page"
- template: templates/page_layouts/page_4_8
- icon: templates/page_layouts/images/page_4_8.png
- regions:
- header:
- label: Header
- content_top:
- label: Content top
- content:
- label: Content
- sidebar:
- label: Sidebar
- content_bottom:
- label: Content bottom
- footer:
- label: Footer
-####
-# Viewmode layouts
-####
-calendar_item:
- label: Calendar Item
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/calendar_item
- icon: templates/viewmode_layouts/images/calendar_item.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
- date:
- label: Date
-search:
- label: Search
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/search
- icon: templates/viewmode_layouts/images/search.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
-stack_simple:
- label: Stack simple
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/stack_simple
- icon: templates/viewmode_layouts/images/stack_simple.png
- regions:
- title:
- label: Title
- info:
- label: Info
- tags:
- label: Tags
- image:
- label: Image
-stack_detail:
- label: Stack detail
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/stack_detail
- icon: templates/viewmode_layouts/images/stack_detail.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
- image:
- label: Image
-summary:
- label: Summary
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/summary
- icon: templates/viewmode_layouts/images/summary.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
-teaser_small:
- label: Teaser small
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/teaser_small
- icon: templates/viewmode_layouts/images/teaser_small.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
- image:
- label: Image
-teaser:
- label: Teaser
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/teaser
- icon: templates/viewmode_layouts/images/teaser.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
- image:
- label: Image
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/govcms_page.html.twig b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/govcms_page.html.twig
deleted file mode 100644
index efb7dbdae..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/govcms_page.html.twig
+++ /dev/null
@@ -1,64 +0,0 @@
-{#
-/**
-* Base content template for extending.
-* Not available via Drupal UI.
-*/
-#}
-{%
- set classes = [
- 'page-layout',
-]
-%}
-
-
- {% if content.header|render|striptags|trim %}
-
-
-
-
- {{ content.header }}
-
-
-
-
- {% endif %}
- {% if content.content_top|render|striptags|trim or content.content|render|striptags|trim or content.sidebar|render|striptags|trim or content.content_bottom|render|striptags|trim %}
-
- {% if content.content_top|render|trim %}
-
-
- {{ content.content_top }}
-
-
- {% endif %}
- {% if content.content|render|striptags|trim or content.sidebar|render|striptags|trim %}
-
-
- {{ content.content }}
-
-
-
- {% endif %}
- {% if content.content_bottom|render|striptags|trim %}
-
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_12_12.png b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_12_12.png
deleted file mode 100644
index a52f64016..000000000
Binary files a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_12_12.png and /dev/null differ
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_4_8.png b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_4_8.png
deleted file mode 100644
index c24488bd6..000000000
Binary files a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_4_8.png and /dev/null differ
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_6_6.png b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_6_6.png
deleted file mode 100644
index c811b585f..000000000
Binary files a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_6_6.png and /dev/null differ
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_8_4.png b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_8_4.png
deleted file mode 100644
index 127b8b92a..000000000
Binary files a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_8_4.png and /dev/null differ
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_edgy.png b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_edgy.png
deleted file mode 100644
index a7919f3fc..000000000
Binary files a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/images/page_edgy.png and /dev/null differ
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_12_12.html.twig b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_12_12.html.twig
deleted file mode 100644
index 95b9e1009..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_12_12.html.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-{#
-/**
-* Template for 1 column layout.
-* Sidebar is below the content.
-*/
-#}
-{% extends '@govcms8_layouts/page_layouts/govcms_page.html.twig' %}
-{% set attributes = attributes.addClass('page-layout--1212') %}
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_4_8.html.twig b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_4_8.html.twig
deleted file mode 100644
index a9ab194e6..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_4_8.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{#
-/**
-* Template for 2 columns layout with 1:2 ratio.
-*/
-#}
-{% extends '@govcms8_layouts/page_layouts/govcms_page.html.twig' %}
-{% set attributes = attributes.addClass('page-layout--48') %}
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_6_6.html.twig b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_6_6.html.twig
deleted file mode 100644
index b8a419ca5..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_6_6.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{#
-/**
-* Template for 2 columns layout with 1:1 ratio.
-*/
-#}
-{% extends '@govcms8_layouts/page_layouts/govcms_page.html.twig' %}
-{% set attributes = attributes.addClass('page-layout--66') %}
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_8_4.html.twig b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_8_4.html.twig
deleted file mode 100644
index c7f4f4326..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_8_4.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{#
-/**
-* Template for 2 columns layout with 2:1 ratio.
-*/
-#}
-{% extends '@govcms8_layouts/page_layouts/govcms_page.html.twig' %}
-{% set attributes = attributes.addClass('page-layout--84') %}
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_edgy.html.twig b/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_edgy.html.twig
deleted file mode 100644
index b245c4a62..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_layouts/templates/page_layouts/page_edgy.html.twig
+++ /dev/null
@@ -1,53 +0,0 @@
-{#
-/**
-* Template for 1 column layout.
-* Sidebar is bellow the content.
-* Everything goes edge to edge.
-*/
-#}
-{%
- set classes = [
- 'page-layout',
- 'page-layout--edgy',
-]
-%}
-
-
- {% if content['#title'] %}
-
{{ content['#title'] }}
- {% endif %}
- {% if content.content_top|render|striptags|trim or content.content|render|striptags|trim or content.content_bottom|render|striptags|trim %}
-
- {% if content.content_top|render|trim %}
-
-
- {{ content.content_top }}
-
-
- {% endif %}
- {% if content.content|render|striptags|trim %}
-
-
- {{ content.content }}
-
-
- {% endif %}
- {% if content.content_bottom|render|striptags|trim %}
-
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/README.md b/modules/distro/govcms8_foundations/modules/govcms8_modifiers/README.md
deleted file mode 100644
index 43d493bd9..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# GovCMS 8 Modifiers
-
-The "GovCMS 8 Modifiers" module is used to store the modifier paragraph types which are used to style the general content paragraphs.
-
-The module ships configuration files, JavaScript and modifier plugins for the Modifiers module.
\ No newline at end of file
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/govcms8_modifiers.info.yml b/modules/distro/govcms8_foundations/modules/govcms8_modifiers/govcms8_modifiers.info.yml
deleted file mode 100644
index 96638b18a..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/govcms8_modifiers.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'GovCMS8 Modifiers'
-type: module
-description: 'Provides modifiers for the GovCMS8 distribution. [obsolete]'
-package: GovCMS [obsolete]
-core_version_requirement: ^9 || ^10
-lifecycle: obsolete
-lifecycle_link: 'https://github.com/GovCMS/GovCMS'
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/govcms8_modifiers.libraries.yml b/modules/distro/govcms8_foundations/modules/govcms8_modifiers/govcms8_modifiers.libraries.yml
deleted file mode 100644
index 0b3af378b..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/govcms8_modifiers.libraries.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-modifiers_relative_height_apply:
- js:
- js/modifiers_relative_height.apply.js: {}
-
-jarallax:
- remote: https://github.com/nk-o/jarallax
- version: 1.10.3
- license:
- name: MIT
- url: https://github.com/nk-o/jarallax/blob/master/LICENSE
- gpl-compatible: true
- js:
- js/jarallax/jarallax.min.js: {}
-
-modifiers_bg_parallax_apply:
- js:
- js/modifiers_bg_parallax.apply.js: {}
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/govcms8_modifiers.modifiers.yml b/modules/distro/govcms8_foundations/modules/govcms8_modifiers/govcms8_modifiers.modifiers.yml
deleted file mode 100644
index 2ed82dfbe..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/govcms8_modifiers.modifiers.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-custom_colors_modifier:
- class: Drupal\govcms8_modifiers\Plugin\modifiers\CustomColorsModifier
- label: 'Colors Modifier'
- description: 'Provides a Modifier to set the colors on an element'
-color_background_modifier:
- class: Drupal\govcms8_modifiers\Plugin\modifiers\ColorBackgroundModifier
- label: 'Colour Background Modifier'
- description: 'Provides a Modifier to set the background color on an element'
-linear_gradient_modifier:
- class: Drupal\govcms8_modifiers\Plugin\modifiers\LinearGradientModifier
- label: 'Linear Gradient Modifier'
- description: 'Provides a Modifier to set the linear gradient on an element using colors from library'
-image_bg_modifier:
- class: Drupal\govcms8_modifiers\Plugin\modifiers\ImageBgModifier
- label: 'Image Background Modifier'
- description: 'Provides a Modifier to set the image background on an element'
-parallax_bg_modifier:
- class: Drupal\govcms8_modifiers\Plugin\modifiers\ParallaxBgModifier
- label: 'Parallax Background Modifier'
- description: 'Provides a Modifier to set the parallax background on an element'
-relative_height_modifier:
- class: Drupal\govcms8_modifiers\Plugin\modifiers\RelativeHeightModifier
- label: 'Relative Height Modifier'
- description: 'Provides a Modifier to set the relative height on an element'
-padding_modifier:
- class: Drupal\govcms8_modifiers\Plugin\modifiers\PaddingModifier
- label: 'Padding Modifier'
- description: 'Provides a Modifier to set the padding on an element'
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/js/jarallax/jarallax.min.js b/modules/distro/govcms8_foundations/modules/govcms8_modifiers/js/jarallax/jarallax.min.js
deleted file mode 100644
index 40891a836..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/js/jarallax/jarallax.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Name : Just Another Parallax [Jarallax]
- * Version : 1.10.6
- * Author : nK
- * GitHub : https://github.com/nk-o/jarallax
- */!function(o){var n={};function i(e){if(n[e])return n[e].exports;var t=n[e]={i:e,l:!1,exports:{}};return o[e].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=o,i.c=n,i.d=function(e,t,o){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(t,e){if(1&e&&(t=i(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(i.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var n in t)i.d(o,n,function(e){return t[e]}.bind(null,n));return o},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="",i(i.s=11)}([,,function(e,t,o){"use strict";e.exports=function(e){"complete"===document.readyState||"interactive"===document.readyState?e.call():document.attachEvent?document.attachEvent("onreadystatechange",function(){"interactive"===document.readyState&&e.call()}):document.addEventListener&&document.addEventListener("DOMContentLoaded",e)}},,function(o,e,t){"use strict";(function(e){var t;t="undefined"!=typeof window?window:void 0!==e?e:"undefined"!=typeof self?self:{},o.exports=t}).call(this,t(5))},function(e,t,o){"use strict";var n,i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(e){"object"===("undefined"==typeof window?"undefined":i(window))&&(n=window)}e.exports=n},,,,,,function(e,t,o){e.exports=o(12)},function(e,t,o){"use strict";var n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},i=l(o(2)),a=o(4),r=l(o(13));function l(e){return e&&e.__esModule?e:{default:e}}var s=a.window.jarallax;if(a.window.jarallax=r.default,a.window.jarallax.noConflict=function(){return a.window.jarallax=s,this},void 0!==a.jQuery){var c=function(){var e=arguments||[];Array.prototype.unshift.call(e,this);var t=r.default.apply(a.window,e);return"object"!==(void 0===t?"undefined":n(t))?t:this};c.constructor=r.default.constructor;var u=a.jQuery.fn.jarallax;a.jQuery.fn.jarallax=c,a.jQuery.fn.jarallax.noConflict=function(){return a.jQuery.fn.jarallax=u,this}}(0,i.default)(function(){(0,r.default)(document.querySelectorAll("[data-jarallax]"))})},function(e,j,S){"use strict";(function(e){Object.defineProperty(j,"__esModule",{value:!0});var d=function(e,t){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return function(e,t){var o=[],n=!0,i=!1,a=void 0;try{for(var r,l=e[Symbol.iterator]();!(n=(r=l.next()).done)&&(o.push(r.value),!t||o.length!==t);n=!0);}catch(e){i=!0,a=e}finally{try{!n&&l.return&&l.return()}finally{if(i)throw a}}return o}(e,t);throw new TypeError("Invalid attempt to destructure non-iterable instance")},t=function(){function n(e,t){for(var o=0;o 'ParallaxBgModifier',
- 'callback' => 'apply',
- 'selector' => $selector,
- 'media' => $media,
- 'args' => [],
- ];
- if (!empty($config['parallax_speed'])) {
- $settings['args']['speed'] = floatval($config['parallax_speed']);
- }
- if (!empty($config['bgp_color_val'])) {
- $css[$media][$selector][] = 'background-color:' . $config['bgp_color_val'];
- }
- $attributes[$media][$selector]['class'][] = 'modifiers-has-background';
-
- return new Modification($css, $libraries, $settings, $attributes);
- }
- return NULL;
- }
-
-}
diff --git a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/src/Plugin/modifiers/RelativeHeightModifier.php b/modules/distro/govcms8_foundations/modules/govcms8_modifiers/src/Plugin/modifiers/RelativeHeightModifier.php
deleted file mode 100644
index 523d46eb1..000000000
--- a/modules/distro/govcms8_foundations/modules/govcms8_modifiers/src/Plugin/modifiers/RelativeHeightModifier.php
+++ /dev/null
@@ -1,58 +0,0 @@
- 'RelativeHeightModifier',
- 'callback' => 'apply',
- 'selector' => $selector,
- 'media' => $media,
- 'args' => [
- 'ratio' => $config['relative_height'],
- ],
- ];
- $css[$media][$selector][] = 'overflow:hidden';
-
- return new Modification($css, $libraries, $settings);
- }
- return NULL;
- }
-
-}
diff --git a/modules/distro/govcms8_layouts/README.md b/modules/distro/govcms8_layouts/README.md
deleted file mode 100644
index 028ce8b18..000000000
--- a/modules/distro/govcms8_layouts/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# GovCMS8 Layouts
-
-The "GovCMS8 Layouts" module is used to ship layouts for GovCMS.
-
-These layouts are for content types and view modes.
diff --git a/modules/distro/govcms8_layouts/govcms8_layouts.info.yml b/modules/distro/govcms8_layouts/govcms8_layouts.info.yml
deleted file mode 100644
index e42233781..000000000
--- a/modules/distro/govcms8_layouts/govcms8_layouts.info.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: GovCMS8 Layouts [DEPRECATED - DO NOT USE]
-type: module
-description: Provides layouts for the GovCMS8 distribution. [deprecated]
-package: GovCMS8 [deprecated]
-
-core_version_requirement: ^9 || ^10
-dependencies:
- - layout_discovery
diff --git a/modules/distro/govcms8_layouts/govcms8_layouts.layouts.yml b/modules/distro/govcms8_layouts/govcms8_layouts.layouts.yml
deleted file mode 100644
index 8d35e71cd..000000000
--- a/modules/distro/govcms8_layouts/govcms8_layouts.layouts.yml
+++ /dev/null
@@ -1,200 +0,0 @@
-####
-# Page layouts
-####
-page_12_12:
- label: Stacked
- category: "GovCMS: Page"
- template: templates/page_layouts/page_12_12
- icon: templates/page_layouts/images/page_12_12.png
- regions:
- header:
- label: Header
- content_top:
- label: Content top
- content:
- label: Content
- sidebar:
- label: Sidebar
- content_bottom:
- label: Content bottom
- footer:
- label: Footer
-page_edgy:
- label: Edge to edge
- category: "GovCMS: Page"
- template: templates/page_layouts/page_edgy
- icon: templates/page_layouts/images/page_edgy.png
- regions:
- header:
- label: Header
- content_top:
- label: Content top
- content:
- label: Content
- content_bottom:
- label: Content bottom
- footer:
- label: Footer
-page_6_6:
- label: Two columns (1:1)
- category: "GovCMS: Page"
- template: templates/page_layouts/page_6_6
- icon: templates/page_layouts/images/page_6_6.png
- regions:
- header:
- label: Header
- content_top:
- label: Content top
- content:
- label: Content
- sidebar:
- label: Sidebar
- content_bottom:
- label: Content bottom
- footer:
- label: Footer
-page_8_4:
- label: Sidebar Right (2:1)
- category: "GovCMS: Page"
- template: templates/page_layouts/page_8_4
- icon: templates/page_layouts/images/page_8_4.png
- regions:
- header:
- label: Header
- content_top:
- label: Content top
- content:
- label: Content
- sidebar:
- label: Sidebar
- content_bottom:
- label: Content bottom
- footer:
- label: Footer
-page_4_8:
- label: Sidebar Left (1:2)
- category: "GovCMS: Page"
- template: templates/page_layouts/page_4_8
- icon: templates/page_layouts/images/page_4_8.png
- regions:
- header:
- label: Header
- content_top:
- label: Content top
- content:
- label: Content
- sidebar:
- label: Sidebar
- content_bottom:
- label: Content bottom
- footer:
- label: Footer
-####
-# Viewmode layouts
-####
-calendar_item:
- label: Calendar Item
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/calendar_item
- icon: templates/viewmode_layouts/images/calendar_item.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
- date:
- label: Date
-search:
- label: Search
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/search
- icon: templates/viewmode_layouts/images/search.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
-stack_simple:
- label: Stack simple
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/stack_simple
- icon: templates/viewmode_layouts/images/stack_simple.png
- regions:
- title:
- label: Title
- info:
- label: Info
- tags:
- label: Tags
- image:
- label: Image
-stack_detail:
- label: Stack detail
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/stack_detail
- icon: templates/viewmode_layouts/images/stack_detail.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
- image:
- label: Image
-summary:
- label: Summary
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/summary
- icon: templates/viewmode_layouts/images/summary.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
-teaser_small:
- label: Teaser small
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/teaser_small
- icon: templates/viewmode_layouts/images/teaser_small.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
- image:
- label: Image
-teaser:
- label: Teaser
- category: "GovCMS: Viewmode"
- template: templates/viewmode_layouts/teaser
- icon: templates/viewmode_layouts/images/teaser.png
- regions:
- title:
- label: Title
- info:
- label: Info
- summary:
- label: Summary
- tags:
- label: Tags
- image:
- label: Image
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/govcms_page.html.twig b/modules/distro/govcms8_layouts/templates/page_layouts/govcms_page.html.twig
deleted file mode 100644
index efb7dbdae..000000000
--- a/modules/distro/govcms8_layouts/templates/page_layouts/govcms_page.html.twig
+++ /dev/null
@@ -1,64 +0,0 @@
-{#
-/**
-* Base content template for extending.
-* Not available via Drupal UI.
-*/
-#}
-{%
- set classes = [
- 'page-layout',
-]
-%}
-
-
- {% if content.header|render|striptags|trim %}
-
-
-
-
- {{ content.header }}
-
-
-
-
- {% endif %}
- {% if content.content_top|render|striptags|trim or content.content|render|striptags|trim or content.sidebar|render|striptags|trim or content.content_bottom|render|striptags|trim %}
-
- {% if content.content_top|render|trim %}
-
-
- {{ content.content_top }}
-
-
- {% endif %}
- {% if content.content|render|striptags|trim or content.sidebar|render|striptags|trim %}
-
-
- {{ content.content }}
-
-
-
- {% endif %}
- {% if content.content_bottom|render|striptags|trim %}
-
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/images/page_12_12.png b/modules/distro/govcms8_layouts/templates/page_layouts/images/page_12_12.png
deleted file mode 100644
index a52f64016..000000000
Binary files a/modules/distro/govcms8_layouts/templates/page_layouts/images/page_12_12.png and /dev/null differ
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/images/page_4_8.png b/modules/distro/govcms8_layouts/templates/page_layouts/images/page_4_8.png
deleted file mode 100644
index c24488bd6..000000000
Binary files a/modules/distro/govcms8_layouts/templates/page_layouts/images/page_4_8.png and /dev/null differ
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/images/page_6_6.png b/modules/distro/govcms8_layouts/templates/page_layouts/images/page_6_6.png
deleted file mode 100644
index c811b585f..000000000
Binary files a/modules/distro/govcms8_layouts/templates/page_layouts/images/page_6_6.png and /dev/null differ
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/images/page_8_4.png b/modules/distro/govcms8_layouts/templates/page_layouts/images/page_8_4.png
deleted file mode 100644
index 127b8b92a..000000000
Binary files a/modules/distro/govcms8_layouts/templates/page_layouts/images/page_8_4.png and /dev/null differ
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/images/page_edgy.png b/modules/distro/govcms8_layouts/templates/page_layouts/images/page_edgy.png
deleted file mode 100644
index a7919f3fc..000000000
Binary files a/modules/distro/govcms8_layouts/templates/page_layouts/images/page_edgy.png and /dev/null differ
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/page_12_12.html.twig b/modules/distro/govcms8_layouts/templates/page_layouts/page_12_12.html.twig
deleted file mode 100644
index 95b9e1009..000000000
--- a/modules/distro/govcms8_layouts/templates/page_layouts/page_12_12.html.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-{#
-/**
-* Template for 1 column layout.
-* Sidebar is below the content.
-*/
-#}
-{% extends '@govcms8_layouts/page_layouts/govcms_page.html.twig' %}
-{% set attributes = attributes.addClass('page-layout--1212') %}
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/page_4_8.html.twig b/modules/distro/govcms8_layouts/templates/page_layouts/page_4_8.html.twig
deleted file mode 100644
index a9ab194e6..000000000
--- a/modules/distro/govcms8_layouts/templates/page_layouts/page_4_8.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{#
-/**
-* Template for 2 columns layout with 1:2 ratio.
-*/
-#}
-{% extends '@govcms8_layouts/page_layouts/govcms_page.html.twig' %}
-{% set attributes = attributes.addClass('page-layout--48') %}
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/page_6_6.html.twig b/modules/distro/govcms8_layouts/templates/page_layouts/page_6_6.html.twig
deleted file mode 100644
index b8a419ca5..000000000
--- a/modules/distro/govcms8_layouts/templates/page_layouts/page_6_6.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{#
-/**
-* Template for 2 columns layout with 1:1 ratio.
-*/
-#}
-{% extends '@govcms8_layouts/page_layouts/govcms_page.html.twig' %}
-{% set attributes = attributes.addClass('page-layout--66') %}
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/page_8_4.html.twig b/modules/distro/govcms8_layouts/templates/page_layouts/page_8_4.html.twig
deleted file mode 100644
index c7f4f4326..000000000
--- a/modules/distro/govcms8_layouts/templates/page_layouts/page_8_4.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{#
-/**
-* Template for 2 columns layout with 2:1 ratio.
-*/
-#}
-{% extends '@govcms8_layouts/page_layouts/govcms_page.html.twig' %}
-{% set attributes = attributes.addClass('page-layout--84') %}
diff --git a/modules/distro/govcms8_layouts/templates/page_layouts/page_edgy.html.twig b/modules/distro/govcms8_layouts/templates/page_layouts/page_edgy.html.twig
deleted file mode 100644
index b245c4a62..000000000
--- a/modules/distro/govcms8_layouts/templates/page_layouts/page_edgy.html.twig
+++ /dev/null
@@ -1,53 +0,0 @@
-{#
-/**
-* Template for 1 column layout.
-* Sidebar is bellow the content.
-* Everything goes edge to edge.
-*/
-#}
-{%
- set classes = [
- 'page-layout',
- 'page-layout--edgy',
-]
-%}
-
-
- {% if content['#title'] %}
-
{{ content['#title'] }}
- {% endif %}
- {% if content.content_top|render|striptags|trim or content.content|render|striptags|trim or content.content_bottom|render|striptags|trim %}
-
- {% if content.content_top|render|trim %}
-
-
- {{ content.content_top }}
-
-
- {% endif %}
- {% if content.content|render|striptags|trim %}
-
-
- {{ content.content }}
-
-
- {% endif %}
- {% if content.content_bottom|render|striptags|trim %}
-