Add 'web/app/themes/badegg/' from commit 'b31aa7550b02a4516fdf161f53dc7666854c9a14'

git-subtree-dir: web/app/themes/badegg
git-subtree-mainline: b862ff9755
git-subtree-split: b31aa7550b

web/app/themes/badegg/.gitattributes

@@ -0,0 +1,2 @@
+/.gitattributes export-ignore
+/.github export-ignore

web/app/themes/badegg/.github/labeler.yml

@@ -0,0 +1,23 @@
+build:
+  - changed-files:
+      - any-glob-to-any-file:
+          - vite.config.js
+dependencies:
+  - changed-files:
+      - any-glob-to-any-file:
+          - package-lock.json
+javascript:
+  - changed-files:
+      - any-glob-to-any-file:
+          - resources/js/**/*.js
+php:
+  - changed-files:
+      - any-glob-to-any-file:
+          - functions.php
+          - app/**/*.php
+          - resources/views/**/*.php
+views:
+  - changed-files:
+      - any-glob-to-any-file:
+          - index.php
+          - resources/views/**/*.php

web/app/themes/badegg/.github/renovate.json

@@ -0,0 +1,23 @@
+{
+  "baseBranches": [
+    "main"
+  ],
+  "commitMessageAction": "⬆️ Bump",
+  "commitMessageTopic": "{{depName}}",
+  "extends": [
+    "config:recommended",
+    "schedule:weekly"
+  ],
+  "rangeStrategy": "bump",
+  "packageRules": [
+    {
+      "matchUpdateTypes": [
+        "minor",
+        "patch",
+        "pin"
+      ],
+      "enabled": true
+    }
+  ],
+  "timezone": "America/Detroit"
+}

web/app/themes/badegg/.github/workflows/discourse.yml

@@ -0,0 +1,18 @@
+name: Post release topic on Discourse
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  post:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: roots/discourse-topic-github-release-action@main
+      with:
+        discourse-api-key: ${{ secrets.DISCOURSE_RELEASES_API_KEY }}
+        discourse-base-url: ${{ secrets.DISCOURSE_BASE_URL }}
+        discourse-author-username: ben
+        discourse-category: 11
+        discourse-tags:
+          releases

web/app/themes/badegg/.github/workflows/labeler.yml

@@ -0,0 +1,11 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

web/app/themes/badegg/.github/workflows/main.yml

@@ -0,0 +1,91 @@
+name: Main
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  node:
+    name: Node ${{ matrix.node }}
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    strategy:
+      matrix:
+        node: ['20']
+
+    steps:
+      - name: Checkout the project
+        uses: actions/checkout@v4
+
+      - name: Setup the Node ${{ matrix.node }} environment on ${{ runner.os }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install dependencies using npm
+        run: npm install
+
+      - name: Build and compile assets
+        run: |
+          npm run build
+          cat public/build/manifest.json
+
+      - name: Validate theme.json
+        run: |
+          THEME_JSON="public/build/assets/theme.json"
+
+          if [ ! -f "$THEME_JSON" ]; then
+            echo "❌ theme.json not found"
+            exit 1
+          fi
+
+          jq -e '
+            (.settings.color.palette | length > 0) and
+            (.settings.typography.fontFamilies | length > 0) and
+            (.settings.typography.fontSizes | length > 0)
+          ' "$THEME_JSON" 2>&1 || {
+            echo "❌ Invalid theme.json structure or missing required values"
+            exit 1
+          }
+
+  php:
+    name: PHP ${{ matrix.php }}
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    strategy:
+      matrix:
+        php: ['8.2']
+
+    steps:
+      - name: Checkout the project
+        uses: actions/checkout@v4
+
+      - name: Setup the PHP ${{ matrix.php }} environment on ${{ runner.os }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Restore the Composer cache directory
+        id: composercache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader --no-suggest
+
+      - name: Run Pint
+        run: vendor/bin/pint --test

web/app/themes/badegg/.gitignore

@@ -1,7 +1,6 @@
 /node_modules
 /vendor
-/public
+/public/*
+!/public/.gitkeep
 .env
-.budfiles
 npm-debug.log
-yarn-error.log

web/app/themes/badegg/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) Roots Software Foundation LLC
+Copyright (c) Roots Software LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

web/app/themes/badegg/README.md

@@ -1,54 +1,31 @@
 <p align="center">
-  <a href="https://roots.io/sage/">
-    <img alt="Sage" src="https://cdn.roots.io/app/uploads/logo-sage.svg" height="100">
-  </a>
+  <a href="https://roots.io/sage/"><img alt="Sage" src="https://cdn.roots.io/app/uploads/logo-sage.svg" height="100"></a>
 </p>
 
 <p align="center">
-  <a href="https://packagist.org/packages/roots/sage">
-    <img alt="Packagist Installs" src="https://img.shields.io/packagist/dt/roots/sage?label=projects%20created&colorB=2b3072&colorA=525ddc&style=flat-square">
-  </a>
-
-  <a href="https://github.com/roots/sage/actions/workflows/main.yml">
-    <img alt="Build Status" src="https://img.shields.io/github/actions/workflow/status/roots/sage/main.yml?branch=main&logo=github&label=CI&style=flat-square">
-  </a>
-
-  <a href="https://twitter.com/rootswp">
-    <img alt="Follow Roots" src="https://img.shields.io/badge/follow%20@rootswp-1da1f2?logo=twitter&logoColor=ffffff&message=&style=flat-square">
-  </a>
+  <a href="https://packagist.org/packages/roots/sage"><img alt="Packagist Installs" src="https://img.shields.io/packagist/dt/roots/sage?label=projects%20created&colorB=2b3072&colorA=525ddc&style=flat-square"></a>
+  <a href="https://github.com/roots/sage/actions/workflows/main.yml"><img alt="Build Status" src="https://img.shields.io/github/actions/workflow/status/roots/sage/main.yml?branch=main&logo=github&label=CI&style=flat-square"></a>
+  <a href="https://bsky.app/profile/roots.dev"><img alt="Follow roots.dev on Bluesky" src="https://img.shields.io/badge/follow-@roots.dev-0085ff?logo=bluesky&style=flat-square"></a>
 </p>
 
-<p align="center">Advanced WordPress starter theme with Tailwind CSS and Laravel Blade</p>
+# Sage
 
-<p align="center">
-  <a href="https://roots.io/sage/">Website</a> &nbsp;&nbsp; <a href="https://roots.io/sage/docs/installation/">Documentation</a> &nbsp;&nbsp; <a href="https://github.com/roots/sage/releases">Releases</a> &nbsp;&nbsp; <a href="https://discourse.roots.io/">Community</a>
-</p>
+**Advanced hybrid WordPress starter theme with Laravel Blade and Tailwind CSS**
+
+- 🔧 Clean, efficient theme templating with Laravel Blade
+- ⚡️ Modern front-end development workflow powered by Vite
+- 🎨 Out of the box support for Tailwind CSS
+- 🚀 Harness the power of Laravel with [Acorn integration](https://github.com/roots/acorn)
+- 📦 Block editor support built-in
+
+Sage brings proper PHP templating and modern JavaScript tooling to WordPress themes. Write organized, component-based code using Laravel Blade, enjoy instant builds and CSS hot-reloading with Vite, and leverage Laravel's robust feature set through Acorn.
+
+[Read the docs to get started](https://roots.io/sage/docs/installation/)
 
 ## Sponsors
 
-Sage is an open source project and completely free to use. If you've benefited from our projects and would like to support our future endeavors, please consider [sponsoring Roots](https://github.com/sponsors/roots).
+Sage is an open source project and completely free to use. If you've benefited from our projects and would like to support our future endeavors, [please consider sponsoring us](https://github.com/sponsors/roots).
 
 <div align="center">
-<a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="120" height="90"></a> <a href="https://carrot.com/"><img src="https://cdn.roots.io/app/uploads/carrot.svg" alt="Carrot" width="120" height="90"></a> <a href="https://wordpress.com/"><img src="https://cdn.roots.io/app/uploads/wordpress.svg" alt="WordPress.com" width="120" height="90"></a> <a href="https://worksitesafety.ca/careers/"><img src="https://cdn.roots.io/app/uploads/worksite-safety.svg" alt="Worksite Safety" width="120" height="90"></a> <a href="https://www.copiadigital.com/"><img src="https://cdn.roots.io/app/uploads/copia-digital.svg" alt="Copia Digital" width="120" height="90"></a> <a href="https://www.freave.com/"><img src="https://cdn.roots.io/app/uploads/freave.svg" alt="Freave" width="120" height="90"></a> <a href="https://40q.agency/"><img src="https://cdn.roots.io/app/uploads/40q.svg" alt="40Q" width="120" height="90"></a>
+<a href="https://carrot.com/"><img src="https://cdn.roots.io/app/uploads/carrot.svg" alt="Carrot" width="120" height="90"></a> <a href="https://wordpress.com/"><img src="https://cdn.roots.io/app/uploads/wordpress.svg" alt="WordPress.com" width="120" height="90"></a> <a href="https://worksitesafety.ca/careers/"><img src="https://cdn.roots.io/app/uploads/worksite-safety.svg" alt="Worksite Safety" width="120" height="90"></a> <a href="https://40q.agency/"><img src="https://cdn.roots.io/app/uploads/40q.svg" alt="40Q" width="120" height="90"></a> <a href="https://www.itineris.co.uk/"><img src="https://cdn.roots.io/app/uploads/itineris.svg" alt="Itineris" width="120" height="90"></a> <a href="https://bonsai.so/"><img src="https://cdn.roots.io/app/uploads/bonsai.svg" alt="Bonsai" width="120" height="90"></a>
 </div>
-
-## Overview
-
-Sage is a WordPress starter theme with block editor support.
-
-- Harness the power of [Laravel](https://laravel.com) and its available packages thanks to [Acorn](https://github.com/roots/acorn)
-- Clean, efficient theme templating utilizing [Laravel Blade](https://laravel.com/docs/master/blade)
-- Modern frontend development workflow powered by [Bud](https://bud.js.org/)
-- Out of the box support for [Tailwind CSS](https://tailwindcss.com/)
-
-## Getting Started
-
-See the [Sage installation documentation](https://roots.io/sage/docs/installation/).
-
-## Stay Connected
-
-- Join us on Discord by [sponsoring us on GitHub](https://github.com/sponsors/roots)
-- Participate on [Roots Discourse](https://discourse.roots.io/)
-- Follow [@rootswp on Twitter](https://twitter.com/rootswp)
-- Read the [Roots Blog](https://roots.io/blog/)
-- Subscribe to the [Roots Newsletter](https://roots.io/newsletter/)

web/app/themes/badegg/app/ACF/CloneGroup.php

@@ -8,51 +8,21 @@ class CloneGroup
     {
 
     }
-    public function block_background()
+    public function background()
     {
         return [
             'contrast',
+            'bg_type',
             'bg_colour',
             'bg_tint',
-        ];
-    }
-
-    public function block_intro()
-    {
-        return [
-            'overline',
-            'heading',
-            'blurb',
-            'intro_alignment',
-        ];
-    }
-
-    public function block_footer()
-    {
-        return [
-            'blurb_footer',
-            'links',
-            'footer_alignment',
-        ];
-    }
-
-    public function block_settings()
-    {
-        return [
-            'section_anchor_id',
+            'bg_opacity',
+            'bg_image',
+            'bg_video',
+            'pattern',
+            'pattern_top',
+            'pattern_bottom',
             'padding_top',
             'padding_bottom',
-            'container_width',
-            'angle_status',
-            'angle_position',
-            'angle_direction',
-            'angle_colour',
-            'angle_tint',
         ];
     }
-
-    public function block_all()
-    {
-        return array_merge($this->block_intro(), $this->block_footer(), $this->block_settings(), $this->block_background());
-    }
 }

web/app/themes/badegg/app/ACF/Dynamic.php

@@ -15,8 +15,6 @@ class Dynamic
         add_filter('acf/load_field/name=fontawesome_regular',   [ $this, 'load_fontawesome_regular_icons' ]);
         add_filter('acf/load_field/name=fontawesome_solid',     [ $this, 'load_fontawesome_solid_icons'   ]);
         add_filter('acf/load_field/name=fontawesome_brands',    [ $this, 'load_fontawesome_brand_icons'   ]);
-
-        add_action( 'acf/input/admin_footer', [$this, 'colour_ui'] );
     }
 
     public function load_colours( $field )
@@ -24,7 +22,6 @@ class Dynamic
         $colour = new Utilities\Colour;
         $NameThatColour = new NameThatColor;
 
-        $defined = get_field('badegg_colours', 'option');
         $colours = $colour->values();
 
         $field['choices'] = [];
@@ -101,42 +98,5 @@ class Dynamic
 
         return $choices;
     }
-
-    public function colour_ui()
-    { ?>
-
-        <script type="text/javascript">
-            console.log("Script loaded from sage/app/ACF/Dynamic.php");
-
-            (function($) {
-
-                function my_custom_escaping_method( original_value){
-                    return original_value;
-                }
-
-                acf.add_filter('select2_escape_markup', function( escaped_value, original_value, $select, settings, field, instance ){
-                    console.log(field.data('name'));
-
-                    const whitelist = [
-                        'colour',
-                        'bg_colour',
-                        'angle_colour',
-                    ];
-
-                    // do something to the original_value to override the default escaping, then return it.
-                    // this value should still have some kind of escaping for security, but you may wish to allow specific HTML.
-                    if (whitelist.includes(field.data( 'name' ))) {
-                        return my_custom_escaping_method( original_value );
-                    }
-
-                    // return
-                    return escaped_value;
-                });
-
-            })(jQuery);
-
-        </script>
-
-    <?php }
 }
 

web/app/themes/badegg/app/Admin/Blocks.php

@@ -6,51 +6,10 @@ class Blocks
 {
     public function __construct()
     {
-        add_action( 'after_setup_theme', [$this, 'block_patterns']);
-        add_filter( 'admin_body_class', [$this, 'editor_classes']);
-        add_filter( 'block_categories_all' ,   [$this, 'categories']);
-        add_action( 'allowed_block_types_all', [$this, 'manage'], 10, 2);
+        add_action('allowed_block_types_all', [$this, 'blacklist'], 100, 2);
     }
 
-    public function block_patterns()
-    {
-        remove_theme_support( 'core-block-patterns' );
-        remove_theme_support('block-templates');
-    }
-
-    public function editor_classes($classes)
-    {
-        global $pagenow;
-
-        if($pagenow == 'post.php'):
-            $ID = @$_GET['post'];
-            $pageTemplate = get_post_meta($ID, '_wp_page_template', true);
-
-            $classes .= ' ' . str_replace('.blade.php', '', $pageTemplate);
-        endif;
-
-        return $classes;
-    }
-
-    public function categories( $categories )
-    {
-
-        // Adding a new category.
-        $categories = array_merge([
-            [
-                'slug'  => 'badegg',
-                'title' => __('Provided by Bad Egg Digital'),
-            ],
-            [
-                'slug'  => 'tempsite',
-                'title' => __('Temporary Site'),
-            ],
-        ], $categories);
-
-        return $categories;
-    }
-
-    public function manage($allowed_block_types, $editor_context)
+    public function blacklist()
     {
         // Reference:
         // https://www.wpexplorer.com/how-to-remove-gutenberg-blocks/
@@ -61,37 +20,7 @@ class Blocks
 
         $blocks = array_keys( \WP_Block_Type_Registry::get_instance()->get_all_registered() );
 
-        $ID = @$editor_context->post->ID;
-        $pageTemplate = get_post_meta($ID, '_wp_page_template', true);
-
-        if($pageTemplate == 'template-plain-document.blade.php'):
-            $blacklist = $this->blacklist([
-                'core/separator',
-                'core/spacer',
-                'core/heading',
-                'core/list',
-                'core/list-item',
-                'core/paragraph',
-                'core/pullquote',
-            ]);
-
-            $blacklist = array_merge($blacklist, [
-                'acf/badegg-wysiwyg',
-            ]);
-
-        else:
-            $blacklist = $this->blacklist();
-        endif;
-
-        return array_values( array_diff( $blocks, $blacklist ) );
-    }
-
-    public function blacklist($whitelist = [])
-    {
         $blacklist = [
-            // Contact Form 7
-            'contact-form-7/contact-form-selector',
-
             // Design
             'core/button',
             'core/comment-template',
@@ -130,7 +59,7 @@ class Blocks
             'core/code',
             'core/details',
             'core/freeform',
-            // 'core/list-item',
+            'core/list-item',
             'core/missing',
             'core/paragraph',
             'core/preformatted',
@@ -201,6 +130,6 @@ class Blocks
             'core/social-links',
         ];
 
-        return array_values( array_diff( $blacklist, $whitelist ) );
+        return array_values( array_diff( $blocks, $blacklist ) );
     }
 }

web/app/themes/badegg/app/Admin/Menus.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Admin;
-
-class Menus
-{
-    public function __construct()
-    {
-        add_action('admin_menu', [$this, 'cleanup_appearance']);
-
-    }
-
-    public function cleanup_appearance()
-    {
-        $customize_url = add_query_arg(
-            'return',
-            urlencode(
-                remove_query_arg(
-                    wp_removable_query_args(),
-                    wp_unslash( $_SERVER['REQUEST_URI'] )
-                )
-            ),
-            'customize.php'
-        );
-
-	    remove_submenu_page( 'themes.php', $customize_url );
-	    remove_submenu_page( 'themes.php', 'widgets.php' );
-	    remove_submenu_page( 'themes.php', 'site-editor.php' );
-    }
-
-}

web/app/themes/badegg/app/Blocks/BadExample.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Blocks;
+use App\Utilities;
+use App\ACF;
+
+class BadExample
+{
+    public function __construct()
+    {
+        add_action('acf/init', [$this, 'init']);
+    }
+
+    public function init()
+    {
+        acf_register_block_type([
+            'name'              => 'badegg/bad-example',
+            'title'             => __('Bad Example'),
+            'description'       => __('This is an example block'),
+            'render_callback'   => [ $this, 'render'],
+            'category'          => 'layout',
+            'multiple'          => false,
+            'icon'              => [
+                'src'   => 'dismiss',
+            ],
+            'supports'          => [
+                'align' => false,
+            ],
+        ]);
+    }
+
+    public function render($block)
+    {
+        $CssClasses = new Utilities\CssClasses;
+        $Colour     = new Utilities\Colour;
+        $CloneGroup = new ACF\CloneGroup;
+
+        $data = [];
+
+        $fields = [
+            'heading',
+            'blurb',
+        ];
+
+        $fields = array_merge($fields, $CloneGroup->background());
+
+        foreach($fields as $field):
+            $data[$field] = get_field($field);
+        endforeach;
+
+        unset($block['data']);
+        $block['name'] = str_replace('acf/', '', $block['name']);
+
+        $data = array_merge($data, $block);
+        $data['section_classes'] = $CssClasses->section($data);
+        $data['block'] = $block;
+
+        $data['knockout'] = ($Colour->is_dark($data['bg_colour'], $data['bg_tint'], $data['contrast'])) ? null : 'knockout';
+
+        echo \Roots\view('blocks.bad-example', [
+            'data' => $data,
+            'block' => $block,
+        ])->render();
+    }
+}

web/app/themes/badegg/app/PostTypes/FAQ.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\PostTypes;
-
-class FAQ
-{
-    public function __construct()
-    {
-        add_action('init', [$this, 'register']);
-    }
-
-    public function register()
-    {
-        $td = 'sage';
-        $postType = 'faq';
-
-        register_extended_post_type(
-            $postType,
-            [
-                'menu_position' => 40,
-                'supports' => [
-                    'title',
-                    'editor',
-                ],
-                'menu_icon' => 'dashicons-admin-comments',
-                'rewrite' => false,
-                'has_archive' => false,
-                'publicly_queryable' => false,
-                'exclude_from_search' => true,
-                'capability_type' => 'page',
-                'show_in_nav_menus' => false,
-                'admin_cols' => [
-                    'faq_category' => [
-                        'title' => __('Category', $td),
-                        'taxonomy' => 'faq_category',
-                    ],
-                ],
-            ],
-        );
-
-        register_extended_taxonomy(
-            'faq_category',
-            $postType,
-            [
-                // 'meta_box' => 'radio',
-                'rewrite' => false,
-                'publicly_queryable' => false,
-                'show_in_nav_menus' => false,
-            ],
-            [
-                'singular' => __('Category', $td),
-                'plural' => __('Categories', $td),
-            ]
-        );
-    }
-}

web/app/themes/badegg/app/PostTypes/Organization.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\PostTypes;
-
-class Organization
-{
-    public function __construct()
-    {
-        add_action('init', [$this, 'register']);
-    }
-
-    public function register()
-    {
-        $td = 'sage';
-        $postType = 'organization';
-
-        register_extended_post_type(
-            $postType,
-            [
-                'menu_position' => 40,
-                'labels' => [
-                    'featured_image' => __('Logo', $td),
-                ],
-                'supports' => [
-                    'title',
-                    'page-attributes',
-                    'thumbnail',
-                ],
-                'menu_icon' => 'dashicons-building',
-                'rewrite' => false,
-                'has_archive' => false,
-                'publicly_queryable' => false,
-                'exclude_from_search' => true,
-                'capability_type' => 'page',
-                'show_in_nav_menus' => false,
-                'admin_cols' => [
-                    'organisation_relationship' => [
-                        'title' => __('Relationship', $td),
-                        'taxonomy' => 'organisation_relationship',
-                    ],
-                ],
-            ],
-        );
-
-        register_extended_taxonomy(
-            'organisation_relationship',
-            $postType,
-            [
-                'meta_box' => 'radio',
-                'rewrite' => false,
-                'publicly_queryable' => false,
-            ],
-            [
-                'singular' => __('Relationship', $td),
-                'plural' => __('Relationships', $td),
-            ]
-        );
-    }
-}

web/app/themes/badegg/app/PostTypes/Testimonial.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\PostTypes;
-
-class Testimonial
-{
-    public function __construct()
-    {
-        add_action('init', [$this, 'register']);
-    }
-
-    public function register()
-    {
-        $td = 'sage';
-        $postType = 'testimonial';
-
-        register_extended_post_type(
-            $postType,
-            [
-                'menu_position' => 40,
-                'supports' => [
-                    'title',
-                ],
-                'menu_icon' => 'dashicons-format-quote',
-                'rewrite' => false,
-                'has_archive' => false,
-                'publicly_queryable' => false,
-                'exclude_from_search' => true,
-                'capability_type' => 'page',
-                'show_in_nav_menus' => false,
-                'admin_cols' => [
-                    'social_link' => [
-                        'title' => __('Name', $td),
-                        'meta_key' => 'badegg_testimonial_name',
-                    ],
-                ],
-            ],
-        );
-    }
-}

web/app/themes/badegg/app/Utilities/Colour.php

@@ -14,7 +14,7 @@ class Colour
             $hex = '#FFFFFF';
         else:
             // TODO: replace company_info settings page and lookup function
-            $hex = @$this->values()[(string)$colour];
+            $hex = $this->values()[(string)$colour];
         endif;
 
         if($tint):
@@ -59,12 +59,19 @@ class Colour
       ];
     }
 
-    public function is_dark($colour = '#FFFFF')
+    public function is_dark($colour = '#FFFFF', $tint = null, $override = null)
     {
 
+        if($override == 'light') return true;
+        if($override == 'dark') return false;
+
         // https://css-tricks.com/snippets/php/convert-hex-to-rgb/
 
-        if ( @$colour[0] == '#' ) $colour = substr( $colour, 1 );
+        if($tint) $colour = $this->adjustBrightness($colour, $this->tints()[$tint]);
+
+        if ( @$colour[0] == '#' ) {
+            $colour = substr( $colour, 1 );
+        }
 
         if ( strlen( $colour ) == 6 ) {
             list( $r, $g, $b ) = [
@@ -102,9 +109,9 @@ class Colour
         }
     }
 
-    public function is_light($colour = '#000000', $override = null)
+    public function is_light($colour = '#000000', $tint = null)
     {
-        if($this->is_dark($colour, $override)) {
+        if($this->is_dark($colour, $tint)) {
             return false;
         } else {
             return true;

web/app/themes/badegg/app/Utilities/CssClasses.php

@@ -21,11 +21,8 @@ class CssClasses {
             ]),
         ];
 
-        if(@$props['angle_status'])
-            $classes[] = 'section-has-angle';
-
-        if(@$props['angle_position'])
-            $classes[] = 'section-has-angle-' . $props['angle_position'];
+        if($Colour->is_dark($hex) && $this->is_knockout_block($props['name']))
+            $classes[] = 'knockout';
 
         if(@$props['padding_top'])
             $classes[] = 'section-zero-top';
@@ -33,12 +30,27 @@ class CssClasses {
         if(@$props['padding_bottom'])
             $classes[] = 'section-zero-bottom';
 
+        if($pattern):
+            if($pattern == 'both'):
+                $classes[] =  'pattern-top';
+                $classes[] =  'pattern-bottom';
+
+            else:
+                $classes[] = 'pattern-' . $pattern;
+
+            endif;
+
+            if(in_array($pattern, ['top', 'both']))
+                $classes[] = 'pattern-top-' . $this->colourTint($pattern_top);
+
+            if(in_array($pattern, ['bottom', 'both']))
+                $classes[] = 'pattern-bottom-' . $this->colourTint($pattern_bottom);
+
+        endif;
+
         if(@$props['bg_image'])
             $classes[] = "bg-watermarked";
 
-        if($Colour->is_dark($hex) && $this->is_knockout_block($props['name']))
-            $classes[] = 'knockout';
-
         if(@$props['className']) $args = array_merge($classes, explode(' ', $props['className']));
 
         return $classes;
@@ -81,7 +93,7 @@ class CssClasses {
     public function is_knockout_block($name = null)
     {
         $blacklist = [
-            'cards-alternating',
+            'bad-example',
         ];
 
         if(in_array($name, $blacklist)):

web/app/themes/badegg/app/Utilities/ImageSrcset.php

@@ -102,7 +102,7 @@ class ImageSrcset
         'alt' => $alt,
         ];
 
-        if($args['lazy'] && !is_admin()):
+        if($args['lazy']):
             $atts['class'] .= ' lazy';
             $atts['src'] = $lazy[0];
             $atts['srcset'] = null;

web/app/themes/badegg/app/View/Composers/App.php

@@ -3,6 +3,7 @@
 namespace App\View\Composers;
 
 use Roots\Acorn\View\Composer;
+use App\Utilities;
 
 class App extends Composer
 {
@@ -16,24 +17,23 @@ class App extends Composer
     ];
 
     /**
-     * Data to be passed to view before rendering.
-     *
-     * @return array
+     * Retrieve the site name.
      */
-    public function with()
-    {
-        return [
-            'siteName' => $this->siteName(),
-        ];
-    }
-
-    /**
-     * Returns the site name.
-     *
-     * @return string
-     */
-    public function siteName()
+    public function siteName(): string
     {
         return get_bloginfo('name', 'display');
     }
+
+    public function with()
+    {
+        return [
+            'Colour' => new Utilities\Colour,
+            'VideoSrcset' => new Utilities\VideoSrcset,
+            'ImageSrcset' => new Utilities\ImageSrcset,
+            'siteName' => $this->siteName(),
+            'company_legal' => get_field('badegg_company_legal', 'option'),
+            'company_tel' => get_field('badegg_company_tel', 'option'),
+            'company_email' => get_field('badegg_company_email', 'option'),
+        ];
+    }
 }

web/app/themes/badegg/app/View/Composers/Comments.php

@@ -15,29 +15,10 @@ class Comments extends Composer
         'partials.comments',
     ];
 
-    /**
-     * Data to be passed to view before rendering.
-     *
-     * @return array
-     */
-    public function with()
-    {
-        return [
-            'title' => $this->title(),
-            'responses' => $this->responses(),
-            'previous' => $this->previous(),
-            'next' => $this->next(),
-            'paginated' => $this->paginated(),
-            'closed' => $this->closed(),
-        ];
-    }
-
     /**
      * The comment title.
-     *
-     * @return string
      */
-    public function title()
+    public function title(): string
     {
         return sprintf(
             /* translators: %1$s is replaced with the number of comments and %2$s with the post title */
@@ -49,13 +30,11 @@ class Comments extends Composer
 
     /**
      * Retrieve the comments.
-     *
-     * @return string
      */
-    public function responses()
+    public function responses(): ?string
     {
         if (! have_comments()) {
-            return;
+            return null;
         }
 
         return wp_list_comments([
@@ -67,13 +46,11 @@ class Comments extends Composer
 
     /**
      * The previous comments link.
-     *
-     * @return string
      */
-    public function previous()
+    public function previous(): ?string
     {
         if (! get_previous_comments_link()) {
-            return;
+            return null;
         }
 
         return get_previous_comments_link(
@@ -83,13 +60,11 @@ class Comments extends Composer
 
     /**
      * The next comments link.
-     *
-     * @return string
      */
-    public function next()
+    public function next(): ?string
     {
         if (! get_next_comments_link()) {
-            return;
+            return null;
         }
 
         return get_next_comments_link(
@@ -99,20 +74,16 @@ class Comments extends Composer
 
     /**
      * Determine if the comments are paginated.
-     *
-     * @return bool
      */
-    public function paginated()
+    public function paginated(): bool
     {
         return get_comment_pages_count() > 1 && get_option('page_comments');
     }
 
     /**
      * Determine if the comments are closed.
-     *
-     * @return bool
      */
-    public function closed()
+    public function closed(): bool
     {
         return ! comments_open() && get_comments_number() != '0' && post_type_supports(get_post_type(), 'comments');
     }

web/app/themes/badegg/app/View/Composers/Post.php

@@ -17,25 +17,10 @@ class Post extends Composer
         'partials.content-*',
     ];
 
-    /**
-     * Data to be passed to view before rendering, but after merging.
-     *
-     * @return array
-     */
-    public function override()
-    {
-        return [
-            'title' => $this->title(),
-            'pagination' => $this->pagination(),
-        ];
-    }
-
     /**
      * Retrieve the post title.
-     *
-     * @return string
      */
-    public function title()
+    public function title(): string
     {
         if ($this->view->name() !== 'partials.page-header') {
             return get_the_title();
@@ -70,10 +55,8 @@ class Post extends Composer
 
     /**
      * Retrieve the pagination links.
-     *
-     * @return string
      */
-    public function pagination()
+    public function pagination(): string
     {
         return wp_link_pages([
             'echo' => 0,

web/app/themes/badegg/app/View/Composers/Socials.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\View\Composers;
+
+use Roots\Acorn\View\Composer;
+
+class Socials extends Composer
+{
+    /**
+     * List of views served by this composer.
+     *
+     * @var array
+     */
+    protected static $views = [
+        'components.socials',
+    ];
+
+    /**
+     * Data to be passed to view before rendering.
+     *
+     * @return array
+     */
+    public function with()
+    {
+        return [
+            'socials' => get_posts([
+                'post_type' => 'social',
+                'order' => 'ASC',
+                'orderby' => 'menu_order name',
+                'posts_per_page' => -1,
+                'fields' => 'ids',
+            ]),
+        ];
+    }
+}

web/app/themes/badegg/app/setup.php

@@ -6,25 +6,56 @@
 
 namespace App;
 
-use function Roots\bundle;
+use Illuminate\Support\Facades\Vite;
 
 /**
- * Register the theme assets.
+ * Inject styles into the block editor.
+ *
+ * @return array
+ */
+add_filter('block_editor_settings_all', function ($settings) {
+    $style = Vite::asset('resources/css/editor.scss');
+
+    $settings['styles'][] = [
+        'css' => "@import url('{$style}')",
+    ];
+
+    return $settings;
+});
+
+/**
+ * Inject scripts into the block editor.
  *
  * @return void
  */
-add_action('wp_enqueue_scripts', function () {
-    bundle('app')->enqueue();
-}, 100);
+add_filter('admin_head', function () {
+    if (! get_current_screen()?->is_block_editor()) {
+        return;
+    }
+
+    $dependencies = json_decode(Vite::content('editor.deps.json'));
+
+    foreach ($dependencies as $dependency) {
+        if (! wp_script_is($dependency)) {
+            wp_enqueue_script($dependency);
+        }
+    }
+
+    echo Vite::withEntryPoints([
+        'resources/js/editor.js',
+    ])->toHtml();
+});
 
 /**
- * Register the theme assets with the block editor.
+ * Use the generated theme.json file.
  *
- * @return void
+ * @return string
  */
-add_action('enqueue_block_editor_assets', function () {
-    bundle('editor')->enqueue();
-}, 100);
+add_filter('theme_file_path', function ($path, $file) {
+    return $file === 'theme.json'
+        ? public_path('build/assets/theme.json')
+        : $path;
+}, 10, 2);
 
 /**
  * Register the initial theme setup.
@@ -122,3 +153,20 @@ add_action('widgets_init', function () {
         'id' => 'sidebar-footer',
     ] + $config);
 });
+
+add_filter('admin_post_thumbnail_size', function(){
+    return "medium";
+});
+
+add_action( 'init', __NAMESPACE__ . '\\cors', 15 );
+function cors() {
+
+    if(WP_ENV == 'development'):
+        header( 'Access-Control-Allow-Origin: *' );
+    endif;
+
+}
+
+$image_srcset = new Utilities\ImageSrcset;
+$image_srcset->add(['name' => 'hero', 'width' => 1920, 'height' => 1000]);
+add_image_size('lazy', 50, 50);

web/app/themes/badegg/bud.config.js

@@ -1,77 +0,0 @@
-/**
- * Compiler configuration
- *
- * @see {@link https://roots.io/sage/docs sage documentation}
- * @see {@link https://bud.js.org/learn/config bud.js configuration guide}
- *
- * @type {import('@roots/bud').Config}
- */
-export default async (app) => {
-  /**
-   * Application assets & entrypoints
-   *
-   * @see {@link https://bud.js.org/reference/bud.entry}
-   * @see {@link https://bud.js.org/reference/bud.assets}
-   */
-  app
-    .entry('app', ['@scripts/app', '@styles/app'])
-    .entry('editor', ['@scripts/editor', '@styles/editor'])
-    .assets(['images']);
-
-  /**
-   * Set public path
-   *
-   * @see {@link https://bud.js.org/reference/bud.setPublicPath}
-   */
-  app.setPublicPath('/app/themes/badegg/public/');
-
-  /**
-   * Development server settings
-   *
-   * @see {@link https://bud.js.org/reference/bud.setUrl}
-   * @see {@link https://bud.js.org/reference/bud.setProxyUrl}
-   * @see {@link https://bud.js.org/reference/bud.watch}
-   */
-  app
-    .setUrl('http://localhost:3000')
-    .setProxyUrl('https://bedrock.local.badegg.uk')
-    .watch(['resources/views', 'app']);
-
-  /**
-   * Generate WordPress `theme.json`
-   *
-   * @note This overwrites `theme.json` on every build.
-   *
-   * @see {@link https://bud.js.org/extensions/sage/theme.json}
-   * @see {@link https://developer.wordpress.org/block-editor/how-to-guides/themes/theme-json}
-   */
-  app.wpjson
-    .setSettings({
-      background: {
-        backgroundImage: true,
-      },
-      color: {
-        custom: false,
-        customDuotone: false,
-        customGradient: false,
-        defaultDuotone: false,
-        defaultGradients: false,
-        defaultPalette: false,
-        duotone: [],
-      },
-      custom: {
-        spacing: {},
-        typography: {
-          'font-size': {},
-          'line-height': {},
-        },
-      },
-      spacing: {
-        padding: true,
-        units: ['px', '%', 'em', 'rem', 'vw', 'vh'],
-      },
-      typography: {
-        customFontSize: false,
-      },
-    });
-};

web/app/themes/badegg/composer.json

@@ -35,15 +35,16 @@
   },
   "autoload": {
     "psr-4": {
-      "App\\": "app/",
-      "Blocks\\": "resources/views/blocks"
+      "App\\": "app/"
     }
   },
   "require": {
-    "php": ">=8.1"
+    "php": ">=8.2",
+    "roots/acorn": "^5.0",
+    "ourcodeworld/name-that-color": "dev-master"
   },
   "require-dev": {
-    "laravel/pint": "^1.13"
+    "laravel/pint": "^1.20"
   },
   "suggest": {
     "log1x/sage-directives": "A collection of useful Blade directives for WordPress and Sage (^1.0)."
@@ -55,11 +56,9 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "extra": {
-    "acorn": {
-      "providers": [
-        "App\\Providers\\ThemeServiceProvider"
-      ]
-    }
+  "scripts": {
+    "post-autoload-dump": [
+      "Roots\\Acorn\\ComposerScripts::postAutoloadDump"
+    ]
   }
 }

web/app/themes/badegg/functions.php

@@ -1,5 +1,7 @@
 <?php
 
+use Roots\Acorn\Application;
+
 /*
 |--------------------------------------------------------------------------
 | Register The Auto Loader
@@ -29,18 +31,11 @@ require $composer;
 |
 */
 
-if (! function_exists('\Roots\bootloader')) {
-    wp_die(
-        __('You need to install Acorn to use this theme.', 'sage'),
-        '',
-        [
-            'link_url' => 'https://roots.io/acorn/docs/installation/',
-            'link_text' => __('Acorn Docs: Installation', 'sage'),
-        ]
-    );
-}
-
-\Roots\bootloader()->boot();
+Application::configure()
+    ->withProviders([
+        App\Providers\ThemeServiceProvider::class,
+    ])
+    ->boot();
 
 /*
 |--------------------------------------------------------------------------
@@ -58,22 +53,12 @@ function autoload_psr4($name) {
     }
 }
 
-function autoload_psr4_blocks() {
-    $path = __dir__ . '/resources/views/blocks/*';
-    $namespace = 'Blocks\\';
-
-    foreach(glob($path, GLOB_ONLYDIR) as $directory) {
-        $name = basename($directory);
-        $class = $namespace . $name . '\\' . $name;
-        new $class();
-    }
-}
-
 autoload_psr4('PostTypes');
 autoload_psr4('ACF');
 autoload_psr4('Utilities');
 autoload_psr4('Admin');
-autoload_psr4_blocks();
+autoload_psr4('Blocks');
+autoload_psr4('Ajax');
 
 /*
 |--------------------------------------------------------------------------

web/app/themes/badegg/jsconfig.json

@@ -1,33 +0,0 @@
-{
-  "extends": [
-    "@roots/bud/config/jsconfig.json",
-    "@roots/sage/config/jsconfig.json"
-  ],
-  "compilerOptions": {
-    "baseUrl": "resources",
-    /**
-     * Resolve aliases
-     */
-    "paths": {
-      "@fonts/*": ["fonts/*"],
-      "@images/*": ["images/*"],
-      "@scripts/*": ["scripts/*"],
-      "@styles/*": ["styles/*"]
-    },
-    /**
-     * Type definitions
-     */
-    "types": [
-      "@roots/bud",
-      "@roots/bud-react",
-      "@roots/bud-postcss",
-      "@roots/bud-preset-recommend",
-      "@roots/bud-preset-wordpress",
-      "@roots/bud-wordpress-theme-json",
-      "@roots/sage"
-    ]
-  },
-  "files": ["bud.config.js"],
-  "include": ["resources"],
-  "exclude": ["node_modules", "public"]
-}

web/app/themes/badegg/package.json

@@ -1,16 +1,13 @@
 {
   "name": "sage",
   "private": true,
-  "browserslist": [
-    "extends @roots/browserslist-config"
-  ],
   "engines": {
     "node": ">=20.0.0"
   },
   "type": "module",
   "scripts": {
-    "dev": "bud dev",
-    "build": "bud build",
+    "dev": "vite",
+    "build": "vite build",
     "translate": "npm run translate:pot && npm run translate:update",
     "translate:pot": "wp i18n make-pot . ./resources/lang/sage.pot --include=\"theme.json,patterns,app,resources\"",
     "translate:update": "for file in ./resources/lang/*.po; do wp i18n update-po ./resources/lang/sage.pot $file; done",
@@ -19,11 +16,9 @@
     "translate:mo": "wp i18n make-mo ./resources/lang ./resources/lang"
   },
   "devDependencies": {
-    "@roots/bud": "6.20.0",
-    "@roots/bud-sass": "6.20.0",
-    "@roots/sage": "6.20.0"
-  },
-  "dependencies": {
-    "@fortawesome/fontawesome-free": "^7.0.1"
+    "@roots/vite-plugin": "^1.0.2",
+    "laravel-vite-plugin": "^1.2.0",
+    "sass": "^1.93.2",
+    "vite": "^6.2.0"
   }
 }

web/app/themes/badegg/resources/acf/group_block_bad_example.json

@@ -1,9 +1,62 @@
 {
-    "key": "group_block_wysiwyg",
-    "title": "Block: WYSIWYG",
+    "key": "group_block_bad_example",
+    "title": "Block: Bad Example",
     "fields": [
         {
-            "key": "field_68334c31c5faf",
+            "key": "field_676599038e31d",
+            "label": "",
+            "name": "",
+            "aria-label": "",
+            "type": "message",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "message": "<h3><span class=\"dashicons dashicons-dismiss\"><\/span> Bad Example<\/h3>",
+            "new_lines": "wpautop",
+            "esc_html": 0
+        },
+        {
+            "key": "field_67659accdc794",
+            "label": "Content",
+            "name": "",
+            "aria-label": "",
+            "type": "tab",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "placement": "top",
+            "endpoint": 0
+        },
+        {
+            "key": "field_67659ad8dc795",
+            "label": "Example",
+            "name": "",
+            "aria-label": "",
+            "type": "message",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "message": "Place your block-specific custom fields here.",
+            "new_lines": "wpautop",
+            "esc_html": 0
+        },
+        {
+            "key": "field_67659a9bdc792",
             "label": "Introduction",
             "name": "introduction",
             "aria-label": "",
@@ -17,7 +70,7 @@
                 "id": ""
             },
             "clone": [
-                "group_clone_block_intro"
+                "group_block_intro"
             ],
             "display": "seamless",
             "layout": "block",
@@ -25,72 +78,7 @@
             "prefix_name": 0
         },
         {
-            "key": "field_68334c31c63fc",
-            "label": "Content",
-            "name": "",
-            "aria-label": "",
-            "type": "accordion",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "open": 1,
-            "multi_expand": 0,
-            "endpoint": 0
-        },
-        {
-            "key": "field_68334c31c6fab",
-            "label": "",
-            "name": "wysiwyg",
-            "aria-label": "",
-            "type": "wysiwyg",
-            "instructions": "All drivers will be displayed if no category is selected.",
-            "required": 0,
-            "conditional_logic": [
-                [
-                    {
-                        "field": "field_68334c31c67cb",
-                        "operator": "==",
-                        "value": "local"
-                    }
-                ]
-            ],
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "default_value": "",
-            "allow_in_bindings": 0,
-            "tabs": "all",
-            "toolbar": "basic",
-            "media_upload": 0,
-            "delay": 0
-        },
-        {
-            "key": "field_68334c31c738b",
-            "label": "Content",
-            "name": "",
-            "aria-label": "",
-            "type": "accordion",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "open": 0,
-            "multi_expand": 0,
-            "endpoint": 1
-        },
-        {
-            "key": "field_68334c31c7775",
+            "key": "field_67659bca78cfa",
             "label": "Footer",
             "name": "footer",
             "aria-label": "",
@@ -104,7 +92,7 @@
                 "id": ""
             },
             "clone": [
-                "group_clone_block_footer"
+                "group_block_footer"
             ],
             "display": "seamless",
             "layout": "block",
@@ -112,7 +100,7 @@
             "prefix_name": 0
         },
         {
-            "key": "field_68334c31c7b66",
+            "key": "field_67659ab5dc793",
             "label": "Settings",
             "name": "settings",
             "aria-label": "",
@@ -139,7 +127,7 @@
             {
                 "param": "block",
                 "operator": "==",
-                "value": "acf\/badegg-wysiwyg"
+                "value": "acf\/badegg-bad-example"
             }
         ]
     ],
@@ -152,5 +140,5 @@
     "active": true,
     "description": "",
     "show_in_rest": 0,
-    "modified": 1748193022
+    "modified": 1734712286
 }

web/app/themes/badegg/resources/acf/group_block_footer.json

@@ -1,5 +1,5 @@
 {
-    "key": "group_clone_block_footer",
+    "key": "group_block_footer",
     "title": "Clone: Block Footer",
     "fields": [
         {
@@ -7,7 +7,7 @@
             "label": "Footer",
             "name": "",
             "aria-label": "",
-            "type": "accordion",
+            "type": "tab",
             "instructions": "",
             "required": 0,
             "conditional_logic": 0,
@@ -16,8 +16,7 @@
                 "class": "",
                 "id": ""
             },
-            "open": 0,
-            "multi_expand": 0,
+            "placement": "top",
             "endpoint": 0
         },
         {
@@ -54,7 +53,7 @@
                 "class": "",
                 "id": ""
             },
-            "layout": "block",
+            "layout": "table",
             "pagination": 0,
             "min": 0,
             "max": 2,
@@ -86,54 +85,6 @@
                     "parent_repeater": "field_67659b7502137"
                 }
             ]
-        },
-        {
-            "key": "field_682fb9ff58080",
-            "label": "Alignment",
-            "name": "footer_alignment",
-            "aria-label": "",
-            "type": "select",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "choices": {
-                "centre": "Centre",
-                "left": "Left",
-                "right": "Right"
-            },
-            "default_value": "centre",
-            "return_format": "value",
-            "multiple": 0,
-            "allow_null": 0,
-            "allow_in_bindings": 0,
-            "ui": 0,
-            "ajax": 0,
-            "placeholder": "",
-            "create_options": 0,
-            "save_options": 0
-        },
-        {
-            "key": "field_6828dac95eb68",
-            "label": "Footer (end)",
-            "name": "",
-            "aria-label": "",
-            "type": "accordion",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "open": 0,
-            "multi_expand": 0,
-            "endpoint": 1
         }
     ],
     "location": [
@@ -154,5 +105,5 @@
     "active": true,
     "description": "",
     "show_in_rest": 0,
-    "modified": 1747958307
+    "modified": 1734712326
 }

web/app/themes/badegg/resources/acf/group_block_intro.json

@@ -0,0 +1,82 @@
+{
+    "key": "group_block_intro",
+    "title": "Clone: Block Intro",
+    "fields": [
+        {
+            "key": "field_67659970db415",
+            "label": "Introduction",
+            "name": "",
+            "aria-label": "",
+            "type": "tab",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "placement": "top",
+            "endpoint": 0
+        },
+        {
+            "key": "field_676599964d3cc",
+            "label": "Heading",
+            "name": "heading",
+            "aria-label": "",
+            "type": "text",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "default_value": "",
+            "maxlength": "",
+            "placeholder": "",
+            "prepend": "",
+            "append": ""
+        },
+        {
+            "key": "field_6765999d4d3cd",
+            "label": "Blurb",
+            "name": "blurb",
+            "aria-label": "",
+            "type": "textarea",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "default_value": "",
+            "maxlength": "",
+            "rows": 3,
+            "placeholder": "",
+            "new_lines": ""
+        }
+    ],
+    "location": [
+        [
+            {
+                "param": "widget",
+                "operator": "==",
+                "value": "rss"
+            }
+        ]
+    ],
+    "menu_order": 0,
+    "position": "normal",
+    "style": "default",
+    "label_placement": "top",
+    "instruction_placement": "label",
+    "hide_on_screen": "",
+    "active": true,
+    "description": "",
+    "show_in_rest": 0,
+    "modified": 1734711913
+}

web/app/themes/badegg/resources/acf/group_clone_background_settings.json

@@ -2,6 +2,33 @@
     "key": "group_clone_background_settings",
     "title": "Clone: Background Settings",
     "fields": [
+        {
+            "key": "field_672d3ba78bc40",
+            "label": "Background Type",
+            "name": "bg_type",
+            "aria-label": "",
+            "type": "select",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "20",
+                "class": "",
+                "id": ""
+            },
+            "choices": {
+                "0": "Solid Colour",
+                "image": "Still Photo",
+                "video": "Looping Video"
+            },
+            "default_value": 0,
+            "return_format": "value",
+            "multiple": 0,
+            "allow_null": 0,
+            "ui": 0,
+            "ajax": 0,
+            "placeholder": ""
+        },
         {
             "key": "field_67325dd23234e",
             "label": "Background Colour",
@@ -12,33 +39,26 @@
             "required": 0,
             "conditional_logic": 0,
             "wrapper": {
-                "width": "50",
+                "width": "20",
                 "class": "",
                 "id": ""
             },
             "choices": {
-                "primary": "<i class=\"fas fa-circle\" style=\"color: #002448\"><\/i> Prussian Blue",
-                "secondary": "<i class=\"fas fa-circle\" style=\"color: #fc533e\"><\/i> Sunset Orange",
-                "tertiary": "<i class=\"fas fa-circle\" style=\"color: #fdd400\"><\/i> Gold",
-                "quaternary": "<i class=\"fas fa-circle\" style=\"color: #7d89d1\"><\/i> Moody Blue",
-                "quinary": "<i class=\"fas fa-circle\" style=\"color: #ffdab4\"><\/i> Frangipani",
-                "0": "<i class=\"fas fa-circle\" style=\"color: #FFFFFF\"><\/i> White",
+                "primary": "<i class=\"fas fa-circle\" style=\"color: #7A74A6\"><\/i> Kimberly",
+                "secondary": "<i class=\"fas fa-circle\" style=\"color: #9C729E\"><\/i> Trendy Pink",
+                "tertiary": "<i class=\"fas fa-circle\" style=\"color: #B8728B\"><\/i> Turkish Rose",
+                "quaternary": "<i class=\"fas fa-circle\" style=\"color: #5875A0\"><\/i> Waikawa Gray",
+                "quinary": "<i class=\"fas fa-circle\" style=\"color: #4298B7\"><\/i> Boston Blue",
                 "black": "<i class=\"fas fa-circle\" style=\"color: #000000\"><\/i> Black",
-                "quaternary-white": "<i class=\"fas fa-circle text-gradient text-gradient-quaternary-white\"><\/i> Moody Blue to White",
-                "quinary-white": "<i class=\"fas fa-circle text-gradient text-gradient-quinary-white\"><\/i> Frangipani to White",
-                "white-quaternary": "<i class=\"fas fa-circle text-gradient text-gradient-white-quaternary\"><\/i> White to Moody Blue",
-                "white-quinary": "<i class=\"fas fa-circle text-gradient text-gradient-white-quinary\"><\/i> White to Frangipani"
+                "0": "<i class=\"fas fa-circle\" style=\"color: #FFFFFF\"><\/i> White"
             },
             "default_value": 0,
             "return_format": "value",
             "multiple": 0,
             "allow_null": 0,
-            "allow_in_bindings": 1,
             "ui": 1,
             "ajax": 0,
-            "placeholder": "",
-            "create_options": 0,
-            "save_options": 0
+            "placeholder": ""
         },
         {
             "key": "field_67325e213234f",
@@ -50,7 +70,7 @@
             "required": 0,
             "conditional_logic": 0,
             "wrapper": {
-                "width": "50",
+                "width": "20",
                 "class": "",
                 "id": ""
             },
@@ -67,12 +87,9 @@
             "return_format": "value",
             "multiple": 0,
             "allow_null": 0,
-            "allow_in_bindings": 1,
             "ui": 1,
             "ajax": 0,
-            "placeholder": "",
-            "create_options": 0,
-            "save_options": 0
+            "placeholder": ""
         },
         {
             "key": "field_67350f526abf1",
@@ -84,7 +101,7 @@
             "required": 0,
             "conditional_logic": 0,
             "wrapper": {
-                "width": "",
+                "width": "20",
                 "class": "",
                 "id": ""
             },
@@ -99,9 +116,413 @@
             "allow_null": 0,
             "ui": 0,
             "ajax": 0,
-            "placeholder": "",
-            "create_options": 0,
-            "save_options": 0
+            "placeholder": ""
+        },
+        {
+            "key": "field_67325e3432350",
+            "label": "Opacity",
+            "name": "bg_opacity",
+            "aria-label": "",
+            "type": "range",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": [
+                [
+                    {
+                        "field": "field_672d3ba78bc40",
+                        "operator": "!=",
+                        "value": "0"
+                    }
+                ]
+            ],
+            "wrapper": {
+                "width": "20",
+                "class": "",
+                "id": ""
+            },
+            "default_value": 30,
+            "min": 5,
+            "max": 100,
+            "step": 5,
+            "prepend": "",
+            "append": "%"
+        },
+        {
+            "key": "field_6734b234f9c47",
+            "label": "Pattern Edge",
+            "name": "pattern",
+            "aria-label": "",
+            "type": "select",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "20",
+                "class": "",
+                "id": ""
+            },
+            "choices": {
+                "0": "Disabled",
+                "top": "Top",
+                "bottom": "Bottom",
+                "both": "Both"
+            },
+            "default_value": 0,
+            "return_format": "value",
+            "multiple": 0,
+            "allow_null": 0,
+            "ui": 0,
+            "ajax": 0,
+            "placeholder": ""
+        },
+        {
+            "key": "field_6734b2daf9c4b",
+            "label": "Top Pattern",
+            "name": "pattern_top",
+            "aria-label": "",
+            "type": "group",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": [
+                [
+                    {
+                        "field": "field_6734b234f9c47",
+                        "operator": "==",
+                        "value": "top"
+                    }
+                ],
+                [
+                    {
+                        "field": "field_6734b234f9c47",
+                        "operator": "==",
+                        "value": "both"
+                    }
+                ]
+            ],
+            "wrapper": {
+                "width": "40",
+                "class": "",
+                "id": ""
+            },
+            "layout": "block",
+            "sub_fields": [
+                {
+                    "key": "field_673514b45e977",
+                    "label": "Colour",
+                    "name": "colour",
+                    "aria-label": "",
+                    "type": "select",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "50",
+                        "class": "",
+                        "id": ""
+                    },
+                    "choices": {
+                        "primary": "<i class=\"fas fa-circle\" style=\"color: #7A74A6\"><\/i> Kimberly",
+                        "secondary": "<i class=\"fas fa-circle\" style=\"color: #9C729E\"><\/i> Trendy Pink",
+                        "tertiary": "<i class=\"fas fa-circle\" style=\"color: #B8728B\"><\/i> Turkish Rose",
+                        "quaternary": "<i class=\"fas fa-circle\" style=\"color: #5875A0\"><\/i> Waikawa Gray",
+                        "quinary": "<i class=\"fas fa-circle\" style=\"color: #4298B7\"><\/i> Boston Blue",
+                        "black": "<i class=\"fas fa-circle\" style=\"color: #000000\"><\/i> Black",
+                        "0": "<i class=\"fas fa-circle\" style=\"color: #FFFFFF\"><\/i> White"
+                    },
+                    "default_value": false,
+                    "return_format": "",
+                    "multiple": 0,
+                    "allow_null": 0,
+                    "ui": 1,
+                    "ajax": 0,
+                    "placeholder": ""
+                },
+                {
+                    "key": "field_673514d85e978",
+                    "label": "Tint",
+                    "name": "tint",
+                    "aria-label": "",
+                    "type": "select",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "50",
+                        "class": "",
+                        "id": ""
+                    },
+                    "choices": {
+                        "lightest": "Lightest",
+                        "lighter": "Lighter",
+                        "light": "Light",
+                        "0": "None",
+                        "dark": "Dark",
+                        "darker": "Darker",
+                        "darkest": "Darkest"
+                    },
+                    "default_value": 0,
+                    "return_format": "value",
+                    "multiple": 0,
+                    "allow_null": 0,
+                    "ui": 0,
+                    "ajax": 0,
+                    "placeholder": ""
+                }
+            ]
+        },
+        {
+            "key": "field_673514f15e979",
+            "label": "Bottom Pattern",
+            "name": "pattern_bottom",
+            "aria-label": "",
+            "type": "group",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "40",
+                "class": "",
+                "id": ""
+            },
+            "layout": "block",
+            "sub_fields": [
+                {
+                    "key": "field_673514f15e97a",
+                    "label": "Colour",
+                    "name": "colour",
+                    "aria-label": "",
+                    "type": "select",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "50",
+                        "class": "",
+                        "id": ""
+                    },
+                    "choices": {
+                        "primary": "<i class=\"fas fa-circle\" style=\"color: #7A74A6\"><\/i> Kimberly",
+                        "secondary": "<i class=\"fas fa-circle\" style=\"color: #9C729E\"><\/i> Trendy Pink",
+                        "tertiary": "<i class=\"fas fa-circle\" style=\"color: #B8728B\"><\/i> Turkish Rose",
+                        "quaternary": "<i class=\"fas fa-circle\" style=\"color: #5875A0\"><\/i> Waikawa Gray",
+                        "quinary": "<i class=\"fas fa-circle\" style=\"color: #4298B7\"><\/i> Boston Blue",
+                        "black": "<i class=\"fas fa-circle\" style=\"color: #000000\"><\/i> Black",
+                        "0": "<i class=\"fas fa-circle\" style=\"color: #FFFFFF\"><\/i> White"
+                    },
+                    "default_value": false,
+                    "return_format": "value",
+                    "multiple": 0,
+                    "allow_null": 0,
+                    "ui": 1,
+                    "ajax": 0,
+                    "placeholder": ""
+                },
+                {
+                    "key": "field_673514f15e97b",
+                    "label": "Tint",
+                    "name": "tint",
+                    "aria-label": "",
+                    "type": "select",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": [
+                        [
+                            {
+                                "field": "field_673514f15e97a",
+                                "operator": "!=",
+                                "value": "black"
+                            }
+                        ],
+                        [
+                            {
+                                "field": "field_673514f15e97a",
+                                "operator": "!=",
+                                "value": "0"
+                            }
+                        ]
+                    ],
+                    "wrapper": {
+                        "width": "50",
+                        "class": "",
+                        "id": ""
+                    },
+                    "choices": {
+                        "lightest": "Lightest",
+                        "lighter": "Lighter",
+                        "light": "Light",
+                        "0": "None",
+                        "dark": "Dark",
+                        "darker": "Darker",
+                        "darkest": "Darkest"
+                    },
+                    "default_value": 0,
+                    "return_format": "value",
+                    "multiple": 0,
+                    "allow_null": 0,
+                    "ui": 0,
+                    "ajax": 0,
+                    "placeholder": ""
+                }
+            ]
+        },
+        {
+            "key": "field_672d3b128bc39",
+            "label": "Background Image",
+            "name": "bg_image",
+            "aria-label": "",
+            "type": "image",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": [
+                [
+                    {
+                        "field": "field_672d3ba78bc40",
+                        "operator": "!=",
+                        "value": "0"
+                    }
+                ]
+            ],
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "return_format": "id",
+            "library": "all",
+            "min_width": "",
+            "min_height": "",
+            "min_size": "",
+            "max_width": "",
+            "max_height": "",
+            "max_size": "",
+            "mime_types": "",
+            "preview_size": "medium"
+        },
+        {
+            "key": "field_672d3b228bc3a",
+            "label": "Background Video",
+            "name": "bg_video",
+            "aria-label": "",
+            "type": "group",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": [
+                [
+                    {
+                        "field": "field_672d3ba78bc40",
+                        "operator": "==",
+                        "value": "video"
+                    }
+                ]
+            ],
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "layout": "block",
+            "sub_fields": [
+                {
+                    "key": "field_672d3b428bc3b",
+                    "label": "Extra Small",
+                    "name": "xs",
+                    "aria-label": "",
+                    "type": "file",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "20",
+                        "class": "",
+                        "id": ""
+                    },
+                    "return_format": "array",
+                    "library": "all",
+                    "min_size": "",
+                    "max_size": "",
+                    "mime_types": "mp4"
+                },
+                {
+                    "key": "field_672d3b678bc3c",
+                    "label": "Small",
+                    "name": "sm",
+                    "aria-label": "",
+                    "type": "file",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "20",
+                        "class": "",
+                        "id": ""
+                    },
+                    "return_format": "array",
+                    "library": "all",
+                    "min_size": "",
+                    "max_size": "",
+                    "mime_types": "mp4"
+                },
+                {
+                    "key": "field_672d3b728bc3d",
+                    "label": "Medium",
+                    "name": "md",
+                    "aria-label": "",
+                    "type": "file",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "20",
+                        "class": "",
+                        "id": ""
+                    },
+                    "return_format": "array",
+                    "library": "all",
+                    "min_size": "",
+                    "max_size": "",
+                    "mime_types": "mp4"
+                },
+                {
+                    "key": "field_672d3b7a8bc3e",
+                    "label": "Large",
+                    "name": "lg",
+                    "aria-label": "",
+                    "type": "file",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "20",
+                        "class": "",
+                        "id": ""
+                    },
+                    "return_format": "array",
+                    "library": "all",
+                    "min_size": "",
+                    "max_size": "",
+                    "mime_types": "mp4"
+                },
+                {
+                    "key": "field_672d3b838bc3f",
+                    "label": "Extra Large",
+                    "name": "xl",
+                    "aria-label": "",
+                    "type": "file",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "20",
+                        "class": "",
+                        "id": ""
+                    },
+                    "return_format": "array",
+                    "library": "all",
+                    "min_size": "",
+                    "max_size": "",
+                    "mime_types": "mp4"
+                }
+            ]
         }
     ],
     "location": [
@@ -122,5 +543,5 @@
     "active": true,
     "description": "",
     "show_in_rest": 0,
-    "modified": 1748194684
+    "modified": 1733505903
 }

web/app/themes/badegg/resources/acf/group_clone_block_intro.json

@@ -1,153 +0,0 @@
-{
-    "key": "group_clone_block_intro",
-    "title": "Clone: Block Intro",
-    "fields": [
-        {
-            "key": "field_67659970db415",
-            "label": "Introduction",
-            "name": "",
-            "aria-label": "",
-            "type": "accordion",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "open": 0,
-            "multi_expand": 0,
-            "endpoint": 0
-        },
-        {
-            "key": "field_682fb8d9f6f3f",
-            "label": "Overline",
-            "name": "overline",
-            "aria-label": "",
-            "type": "text",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "default_value": "",
-            "maxlength": "",
-            "allow_in_bindings": 0,
-            "placeholder": "",
-            "prepend": "",
-            "append": ""
-        },
-        {
-            "key": "field_676599964d3cc",
-            "label": "Heading",
-            "name": "heading",
-            "aria-label": "",
-            "type": "textarea",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "hfont",
-                "id": ""
-            },
-            "default_value": "",
-            "maxlength": "",
-            "allow_in_bindings": 0,
-            "rows": 2,
-            "placeholder": "",
-            "new_lines": "br"
-        },
-        {
-            "key": "field_6765999d4d3cd",
-            "label": "Blurb",
-            "name": "blurb",
-            "aria-label": "",
-            "type": "textarea",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "default_value": "",
-            "maxlength": "",
-            "rows": 3,
-            "placeholder": "",
-            "new_lines": ""
-        },
-        {
-            "key": "field_682fb9add5a3b",
-            "label": "Alignment",
-            "name": "intro_alignment",
-            "aria-label": "",
-            "type": "select",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "choices": {
-                "centre": "Centre",
-                "left": "Left",
-                "right": "Right"
-            },
-            "default_value": "centre",
-            "return_format": "value",
-            "multiple": 0,
-            "allow_null": 0,
-            "allow_in_bindings": 0,
-            "ui": 0,
-            "ajax": 0,
-            "placeholder": "",
-            "create_options": 0,
-            "save_options": 0
-        },
-        {
-            "key": "field_6828dae1d1bb0",
-            "label": "Intro (end)",
-            "name": "",
-            "aria-label": "",
-            "type": "accordion",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "open": 0,
-            "multi_expand": 0,
-            "endpoint": 1
-        }
-    ],
-    "location": [
-        [
-            {
-                "param": "widget",
-                "operator": "==",
-                "value": "rss"
-            }
-        ]
-    ],
-    "menu_order": 0,
-    "position": "normal",
-    "style": "default",
-    "label_placement": "top",
-    "instruction_placement": "label",
-    "hide_on_screen": "",
-    "active": true,
-    "description": "",
-    "show_in_rest": 0,
-    "modified": 1747958910
-}

web/app/themes/badegg/resources/acf/group_clone_block_settings.json

@@ -7,7 +7,7 @@
             "label": "Settings",
             "name": "",
             "aria-label": "",
-            "type": "accordion",
+            "type": "tab",
             "instructions": "",
             "required": 0,
             "conditional_logic": 0,
@@ -16,59 +16,9 @@
                 "class": "",
                 "id": ""
             },
-            "open": 0,
-            "multi_expand": 0,
+            "placement": "top",
             "endpoint": 0
         },
-        {
-            "key": "field_680016e0fac24",
-            "label": "Anchor ID",
-            "name": "section_anchor_id",
-            "aria-label": "",
-            "type": "text",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "default_value": "",
-            "maxlength": "",
-            "placeholder": "",
-            "prepend": "#",
-            "append": ""
-        },
-        {
-            "key": "field_6800097e61765",
-            "label": "Container Width",
-            "name": "container_width",
-            "aria-label": "",
-            "type": "select",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "choices": {
-                "0": "Full Width",
-                "large": "Large",
-                "medium": "Medium",
-                "small": "Small",
-                "narrow": "Narrow"
-            },
-            "default_value": 0,
-            "return_format": "value",
-            "multiple": 0,
-            "allow_null": 0,
-            "ui": 0,
-            "ajax": 0,
-            "placeholder": ""
-        },
         {
             "key": "field_67350eb62cdf9",
             "label": "Top Padding",
@@ -79,7 +29,7 @@
             "required": 0,
             "conditional_logic": 0,
             "wrapper": {
-                "width": "50",
+                "width": "33.33",
                 "class": "",
                 "id": ""
             },
@@ -104,7 +54,7 @@
             "required": 0,
             "conditional_logic": 0,
             "wrapper": {
-                "width": "50",
+                "width": "33.33",
                 "class": "",
                 "id": ""
             },
@@ -158,46 +108,6 @@
             "layout": "block",
             "prefix_label": 0,
             "prefix_name": 0
-        },
-        {
-            "key": "field_67fff4d4ddbb7",
-            "label": "Angle",
-            "name": "angle",
-            "aria-label": "",
-            "type": "clone",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "clone": [
-                "group_clone_angle"
-            ],
-            "display": "seamless",
-            "layout": "block",
-            "prefix_label": 1,
-            "prefix_name": 1
-        },
-        {
-            "key": "field_6828da67543fc",
-            "label": "Settings (end)",
-            "name": "",
-            "aria-label": "",
-            "type": "accordion",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "open": 0,
-            "multi_expand": 0,
-            "endpoint": 1
         }
     ],
     "location": [
@@ -218,5 +128,5 @@
     "active": true,
     "description": "",
     "show_in_rest": 0,
-    "modified": 1747508044
+    "modified": 1731536288
 }

web/app/themes/badegg/resources/acf/group_clone_button.json

@@ -9,15 +9,14 @@
             "aria-label": "",
             "type": "link",
             "instructions": "",
-            "required": 1,
+            "required": 0,
             "conditional_logic": 0,
             "wrapper": {
-                "width": "",
+                "width": "40",
                 "class": "",
                 "id": ""
             },
-            "return_format": "array",
-            "allow_in_bindings": 1
+            "return_format": "array"
         },
         {
             "key": "field_673529a2a37a1",
@@ -27,22 +26,14 @@
             "type": "text",
             "instructions": "",
             "required": 0,
-            "conditional_logic": [
-                [
-                    {
-                        "field": "field_672d3d7b2c273",
-                        "operator": "!=empty"
-                    }
-                ]
-            ],
+            "conditional_logic": 0,
             "wrapper": {
-                "width": "",
+                "width": "20",
                 "class": "",
                 "id": ""
             },
             "default_value": "",
             "maxlength": "",
-            "allow_in_bindings": 1,
             "placeholder": "",
             "prepend": "",
             "append": ""
@@ -55,42 +46,28 @@
             "type": "select",
             "instructions": "",
             "required": 0,
-            "conditional_logic": [
-                [
-                    {
-                        "field": "field_672d3d7b2c273",
-                        "operator": "!=empty"
-                    }
-                ]
-            ],
+            "conditional_logic": 0,
             "wrapper": {
-                "width": "",
+                "width": "20",
                 "class": "",
                 "id": ""
             },
             "choices": {
-                "primary": "<i class=\"fas fa-circle\" style=\"color: #002448\"><\/i> Prussian Blue",
-                "secondary": "<i class=\"fas fa-circle\" style=\"color: #fc533e\"><\/i> Sunset Orange",
-                "tertiary": "<i class=\"fas fa-circle\" style=\"color: #fdd400\"><\/i> Gold",
-                "quaternary": "<i class=\"fas fa-circle\" style=\"color: #7d89d1\"><\/i> Moody Blue",
-                "quinary": "<i class=\"fas fa-circle\" style=\"color: #ffdab4\"><\/i> Frangipani",
-                "0": "<i class=\"fas fa-circle\" style=\"color: #FFFFFF\"><\/i> White",
+                "primary": "<i class=\"fas fa-circle\" style=\"color: #7A74A6\"><\/i> Kimberly",
+                "secondary": "<i class=\"fas fa-circle\" style=\"color: #9C729E\"><\/i> Trendy Pink",
+                "tertiary": "<i class=\"fas fa-circle\" style=\"color: #B8728B\"><\/i> Turkish Rose",
+                "quaternary": "<i class=\"fas fa-circle\" style=\"color: #5875A0\"><\/i> Waikawa Gray",
+                "quinary": "<i class=\"fas fa-circle\" style=\"color: #4298B7\"><\/i> Boston Blue",
                 "black": "<i class=\"fas fa-circle\" style=\"color: #000000\"><\/i> Black",
-                "quaternary-white": "<i class=\"fas fa-circle text-gradient text-gradient-quaternary-white\"><\/i> Moody Blue to White",
-                "quinary-white": "<i class=\"fas fa-circle text-gradient text-gradient-quinary-white\"><\/i> Frangipani to White",
-                "white-quaternary": "<i class=\"fas fa-circle text-gradient text-gradient-white-quaternary\"><\/i> White to Moody Blue",
-                "white-quinary": "<i class=\"fas fa-circle text-gradient text-gradient-white-quinary\"><\/i> White to Frangipani"
+                "0": "<i class=\"fas fa-circle\" style=\"color: #FFFFFF\"><\/i> White"
             },
-            "default_value": "primary",
+            "default_value": 0,
             "return_format": "value",
             "multiple": 0,
             "allow_null": 0,
-            "allow_in_bindings": 1,
             "ui": 1,
             "ajax": 0,
-            "placeholder": "",
-            "create_options": 0,
-            "save_options": 0
+            "placeholder": ""
         },
         {
             "key": "field_672d3dc52c275",
@@ -100,16 +77,9 @@
             "type": "select",
             "instructions": "",
             "required": 0,
-            "conditional_logic": [
-                [
-                    {
-                        "field": "field_672d3d7b2c273",
-                        "operator": "!=empty"
-                    }
-                ]
-            ],
+            "conditional_logic": 0,
             "wrapper": {
-                "width": "",
+                "width": "20",
                 "class": "",
                 "id": ""
             },
@@ -121,12 +91,9 @@
             "return_format": "value",
             "multiple": 0,
             "allow_null": 0,
-            "allow_in_bindings": 1,
             "ui": 0,
             "ajax": 0,
-            "placeholder": "",
-            "create_options": 0,
-            "save_options": 0
+            "placeholder": ""
         }
     ],
     "location": [
@@ -147,5 +114,5 @@
     "active": true,
     "description": "",
     "show_in_rest": 0,
-    "modified": 1748001311
+    "modified": 1731537485
 }

web/app/themes/badegg/resources/acf/group_post_social.json

@@ -1,6 +1,6 @@
 {
     "key": "group_post_social",
-    "title": "Settings: Social Channel",
+    "title": "Social Channel Settings",
     "fields": [
         {
             "key": "field_664c658853f1b",
@@ -492,9 +492,7 @@
             "allow_null": 0,
             "ui": 1,
             "ajax": 0,
-            "placeholder": "",
-            "create_options": 0,
-            "save_options": 0
+            "placeholder": ""
         },
         {
             "key": "field_664c65c653f1c",
@@ -532,5 +530,5 @@
     "active": true,
     "description": "",
     "show_in_rest": 0,
-    "modified": 1748087727
+    "modified": 1734711372
 }

web/app/themes/badegg/resources/acf/group_settings_organization.json

@@ -1,42 +0,0 @@
-{
-    "key": "group_settings_organization",
-    "title": "Organization Settings",
-    "fields": [
-        {
-            "key": "field_6754469181492",
-            "label": "Website",
-            "name": "website",
-            "aria-label": "",
-            "type": "url",
-            "instructions": "",
-            "required": 0,
-            "conditional_logic": 0,
-            "wrapper": {
-                "width": "",
-                "class": "",
-                "id": ""
-            },
-            "default_value": "",
-            "placeholder": ""
-        }
-    ],
-    "location": [
-        [
-            {
-                "param": "post_type",
-                "operator": "==",
-                "value": "organization"
-            }
-        ]
-    ],
-    "menu_order": 0,
-    "position": "normal",
-    "style": "seamless",
-    "label_placement": "top",
-    "instruction_placement": "label",
-    "hide_on_screen": "",
-    "active": true,
-    "description": "",
-    "show_in_rest": 0,
-    "modified": 1733960217
-}

web/app/themes/badegg/resources/css/app.scss

@@ -0,0 +1,26 @@
+// Global Variables, Mixins, and Framework
+@use "global/variables";
+@use "global/mixins";
+@use "global/fonts";
+@use "global/typography";
+@use "global/framework";
+
+// Third Party Plugins
+@use "plugins/contact-form-7";
+@use "plugins/mce";
+
+// Sections
+@use "sections/header";
+@use "sections/footer";
+
+// Components
+@use "components/forms";
+@use "components/button";
+@use "components/card";
+
+// Blocks
+@use "blocks/BadExample";
+
+// Page Styles
+@use "views/page";
+

web/app/themes/badegg/resources/css/components/_button.scss

@@ -1,3 +1,6 @@
+@use "../global/fonts";
+@use "../global/variables/colours";
+
 button {
   &%block,
   &.block {
@@ -10,68 +13,66 @@ button {
 
 button,
 input[type="submit"] {
-  &.btn {
+  &.button {
     appearance: none;
   }
 }
 
-%btn,
-.btn {
+%button,
+.button {
   display: inline-block;
-  padding: 0.75em 1.5em;
-  border: 0.125em solid $black;
-  border-radius: 2em;
-  background-color: $black;
-  color: $white;
-  font-family: $font;
+  padding: 0.5em 1.25em;
+  border: 0.125em solid colours.$black;
+  border-radius: 0.25em;
+  background-color: colours.$black;
+  color: colours.$white;
+  font-family: fonts.$font;
   font-weight: 700;
-  font-size: 1em;
-  text-transform: lowercase;
   text-decoration: none;
   white-space: normal;
   cursor: pointer;
   transition: 300ms ease all;
 
   .knockout & {
-    background-color: $white;
-    border-color: $white;
+    background-color: colours.$white;
+    border-color: colours.$white;
     color: currentcolor;
   }
 
   &:hover,
   &:focus {
-    color: $white;
+    color: colours.$white;
     text-decoration: none;
-    background-color: rgba($black, 0.5);
-    border-color: rgba($black, 0.5);
+    background-color: rgba(colours.$black, 0.5);
+    border-color: rgba(colours.$black, 0.5);
 
     .knockout & {
-      background-color: rgba($white, 0.5);
-      border-color: rgba($white, 0.5);
+      background-color: rgba(colours.$white, 0.5);
+      border-color: rgba(colours.$white, 0.5);
       color: currentcolor;
     }
   }
 
   &.outline {
-    border-color: $black;
+    border-color: colours.$black;
     background-color: transparent;
-    color: $black;
+    color: colours.$black;
 
     &:hover,
     &:focus {
-      background-color: $black;
-      color: $white;
+      background-color: colours.$black;
+      color: colours.$white;
     }
 
     .knockout & {
       @media screen {
-        border-color: $white;
-        color: $white;
+        border-color: colours.$white;
+        color: colours.$white;
 
         &:hover,
         &:focus {
-          background-color: $white;
-          color: $black;
+          background-color: colours.$white;
+          color: colours.$black;
         }
       }
     }
@@ -101,11 +102,10 @@ input[type="submit"] {
   &.bigger { font-size: 1.5em; }
 }
 
-.btn-wrap {
+.button-wrap {
   margin: 1.5em -0.25em -0.25em;
 
-  input[type=submit],
-  .btn {
+  .button {
     margin: 0.25em;
   }
 }

web/app/themes/badegg/resources/css/components/_forms.scss

@@ -1,36 +1,32 @@
-select,
-input:not([type="submit"]):not([type="checkbox"]):not([type="radio"]),
+@use "../global/fonts";
+@use "../global/variables/breakpoints";
+@use "../global/variables/colours";
+
 textarea {
-  color: $grey-dark;
+  min-height: 10.375em;
+}
+
+input,
+textarea {
+  color: colours.$grey;
   background: white;
   font-weight: 400;
   font-size: 1em;
-  font-family: $font;
+  font-family: fonts.$font;
   width: 100%;
-  padding: 0.5em 1em;
-  margin: 0;
-  border-radius: 0;
-  border: 1px solid $grey;
+  padding: 0.875em 1em;
+  margin: 0 0 1em;
+  // border-radius: 0.125em;
+  border: 0.0625em solid rgba(colours.$black, 0.1);
+  outline: none;
   transition: all 300ms ease;
-  outline-color: $primary-lighter;
 
   &::placeholder {
-    color: $grey-lighter;
+    color: colours.$grey-light;
   }
 
   &:focus {
-    border-color: $primary-light;
-    color: $primary-lighter;
-  }
-
-  .hfont & {
-    font-weight: bold;
-    font-family: $hfont;
-    color: $primary;
-
-    &:focus {
-      color: $primary-lighter;
-    }
+    box-shadow: 0 0.25em 0.5em rgba(colours.$black, 0.1);
   }
 }
 
@@ -47,18 +43,16 @@ input[type="checkbox"] {
 
 select {
   width: 100%;
-  appearance: none;
 }
 
 .field-wrap {
   flex: 1 1 calc(100% - 1em);
-  margin: 0.5em;
+  margin: 0 0.5em;
   transition: all 300ms ease;
 
-  span.label {
-    display: block;
-    font-size: 0.75em;
-    margin: 0 0 0.25em;
+  p {
+    display: flex;
+    flex-wrap: wrap;
   }
 
   label {
@@ -75,35 +69,17 @@ select {
     margin: 0;
   }
 
-  .has-icon {
-    position: relative;
-
-    i {
-      position: absolute;
-      top: 0.45em;
-      left: 0.5em;
-      z-index: 1;
-      color: $quaternary-lighter;
-      font-size: 1.25em;
-    }
-
-    input,
-    select {
-      padding-left: 2.5em !important;
-    }
-  }
-
   /* stylelint-disable selector-class-pattern */
   .mce_inline_error {
     flex: 0 0 100%;
     max-width: 100%;
     width: 100%;
     margin: 0;
-    font-family: $font;
+    font-family: fonts.$font;
   }
   /* stylelint-enable selector-class-pattern */
 
-  @media (min-width: $screen-sm) {
+  @media (min-width: breakpoints.$screen-sm) {
     &.half {
       flex: 0 0 calc(50% - 1em);
       max-width: calc(50% - 1em);
@@ -112,41 +88,73 @@ select {
   }
 }
 
-.select-wrap {
-  .has-icon {
-    select {
-      padding-right: 1.5em;
+.form-footer {
+  p {
+    margin: 0;
+    line-height: 1.2;
+  }
+
+  button,
+  .button,
+  input[type="submit"] {
+    margin: 0;
+  }
+
+  .wpcf7-list-item {
+    margin: 0;
+    user-select: none;
+  }
+
+  .form-footer-button {
+    flex: 1 1 100%;
+    display: block;
+    margin: 2em 0 0;
+  }
+
+  @media (min-width: breakpoints.$screen-sm) {
+    display: flex;
+    flex-wrap: wrap;
+
+    .form-footer-button {
+      flex: 0 0 8.5em;
+      max-width: 8.5em;
+      width: 8.5em;
+      margin: 0 0 0 2em;
+      text-align: right;
     }
 
-    &::after {
-      content: '\f0d7';
-      font-family: 'Font Awesome 6 Free', serif;
-      font-weight: 900;
-      display: block;
-      position: absolute;
-      top: 0.375em;
-      right: 0.75em;
-      color: $grey-light;
+    .form-footer-text {
+      flex: 1 1 5em;
+      margin: auto;
+
+      p {
+        display: block;
+      }
     }
   }
 }
 
 .section-form {
-  container-name: SectionForm;
-  container-type: inline-size;
+  button {
+    margin: 1em 0 0;
+  }
+
+  span.label {
+    font-weight: 700;
+  }
+
+  .textarea-wrap {
+    span.label {
+      display: none;
+    }
+  }
 
   form {
     display: flex;
     flex-wrap: wrap;
-    margin: -0.5em;
+    margin: 1em -0.5em 0;
     position: relative;
 
-    div[class^="eacf7-form-"] {
-      flex: auto;
-      display: flex;
-      flex-wrap: wrap;
-    }
-
     .wpcf7 {
       .screen-reader-response {
         display: none;
@@ -159,55 +167,27 @@ select {
         left: calc(50% - 12px);
       }
 
-      &-form-control-wrap {
-        display: block;
-      }
-
       &-not-valid-tip {
-        position: absolute;
-        right: -0.5em;
-        top: -3.125em;
-        background: $error;
-        color: $white;
+        background: colours.$error;
+        color: colours.$white;
         padding: 0.5em 1em;
-        border-radius: 0.5em;
+        border-radius: 0 0 0.5em 0.5em;
         font-weight: 700;
-        font-size: 0.75em;
-        transition: all 300ms ease;
-
-        &::before {
-          content: '';
-          position: absolute;
-          right: 1em;
-          bottom: -0.25em;
-          display: block;
-          width: 1em;
-          height: 1em;
-          background: $error;
-          transform: rotate(45deg);
-        }
-
-        &:hover {
-          opacity: 0.1;
-        }
       }
 
       &-response-output {
-        display: block;
-        margin: 2em auto 0;
-        flex: 1 1 100%;
-        width: 100%;
-        text-align: left;
-        font-family: $font;
+        margin: 1em 0.5em 0;
+        max-width: calc(100% - 1em);
+        width: calc(100% - 1em);
+        flex: 0 0 calc(100% - 1em);
+        text-align: center;
+        color: colours.$white;
+        font-family: fonts.$font;
         font-weight: 700;
-        font-size: 0.875em;
+        background: colours.$black;
+        border: 0.125em solid colours.$white;
         padding: 0.5em 1em;
         border-radius: 0.5em;
-        border-width: 0;
-
-        @extend .white;
-        @extend .bg-black;
-        @extend .knockout;
       }
 
       &-display-none {
@@ -231,7 +211,7 @@ select {
           display: block;
           width: 1.25em;
           height: 1.25em;
-          border: 0.125em solid $black;
+          border: 0.125em solid colours.$black;
           background: transparent;
           color: currentcolor;
 
@@ -256,29 +236,6 @@ select {
       }
     }
 
-    .form-footer {
-      @container SectionForm (min-width: #{$screen-sm}) {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        &-text {
-          flex: 1;
-        }
-      }
-
-      button,
-      .btn,
-      input[type="submit"] {
-        margin: 0;
-      }
-
-      .wpcf7-list-item {
-        margin: 0;
-        user-select: none;
-      }
-    }
-
     &.submitting {
       .field-wrap:not(.form-footer) {
         opacity: 0.1;
@@ -297,13 +254,15 @@ select {
 
     &.sent {
       .wpcf7-response-output {
-        @extend .bg-success;
+        background: colours.$success;
+        border-color: colours.$white;
       }
     }
 
     &.invalid {
       .wpcf7-response-output {
-        @extend .bg-error;
+        background: colours.$error;
+        border-color: colours.$white;
       }
     }
 
@@ -322,7 +281,7 @@ select {
       .wpcf7 {
         &-checkbox {
           input[type="checkbox"] {
-            border-color: $white;
+            border-color: colours.$white;
           }
         }
       }

web/app/themes/badegg/resources/css/global/_fonts.scss

@@ -0,0 +1,56 @@
+$font: "Ubuntu", Helvetica, Arial, sans-serif;
+
+/*
+ * Roots Fonts Setup
+ * https://roots.io/sage/docs/fonts-setup/
+ *
+ * Self-Hosted Google Fonts (Ubuntu Demo)
+ * https://gwfh.mranftl.com/fonts/ubuntu?subsets=latin
+ *
+ * Add the font to your Tailwind config
+ * tailwind.config.cjs
+ *
+ * Configure theme.json to use the font with Bud
+ */
+
+/* stylelint-disable */
+
+/* ubuntu-regular - latin */
+@font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+  font-family: 'Ubuntu';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/ubuntu-v20-latin-regular.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+       url('../fonts/ubuntu-v20-latin-regular.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* ubuntu-italic - latin */
+@font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+  font-family: 'Ubuntu';
+  font-style: italic;
+  font-weight: 400;
+  src: url('../fonts/ubuntu-v20-latin-italic.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+       url('../fonts/ubuntu-v20-latin-italic.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* ubuntu-700 - latin */
+@font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+  font-family: 'Ubuntu';
+  font-style: normal;
+  font-weight: 700;
+  src: url('../fonts/ubuntu-v20-latin-700.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+       url('../fonts/ubuntu-v20-latin-700.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* ubuntu-700italic - latin */
+@font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+  font-family: 'Ubuntu';
+  font-style: italic;
+  font-weight: 700;
+  src: url('../fonts/ubuntu-v20-latin-700italic.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+       url('../fonts/ubuntu-v20-latin-700italic.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}

web/app/themes/badegg/resources/css/global/_framework.scss

@@ -0,0 +1,4 @@
+@use "framework/breakpoints";
+@use "framework/normalise";
+@use "framework/colours";
+@use "framework/spacing";

web/app/themes/badegg/resources/css/global/_mixins.scss

@@ -0,0 +1,4 @@
+@use "mixins/linear-gradient";
+@use "mixins/text-contrast";
+@use "mixins/generate-colour-classes";
+@use "mixins/generate-button-classes";

web/app/themes/badegg/resources/css/global/_typography.scss

@@ -1,14 +1,29 @@
+@use "fonts";
+@use "variables/breakpoints";
+@use "variables/colours";
+@use "variables/spacing";
+
+.wysiwyg {
+  *:first-child {
+    margin-top: 0;
+  }
+
+  *:last-child {
+    margin-bottom: 0;
+  }
+}
+
 h1,
 h2,
 h3,
 h4,
 h5,
 h6 {
-  color: $primary;
+  color: colours.$primary;
   font-weight: 700;
-  font-family: $hfont;
+  font-family: fonts.$font;
   line-height: 1.1em;
-  margin: 1.5em 0 0.5em;
+  margin: 1.5em 0 0.25em;
   padding: 0;
 
   &.section-title {
@@ -17,7 +32,7 @@ h6 {
 
   @media screen {
     .knockout & {
-      color: $white;
+      color: colours.$white;
     }
   }
 }
@@ -33,7 +48,7 @@ h3 { font-size: 1.25em; }
 h4,
 h5 { font-size: 1.15em; }
 
-@container (min-width: #{$screen-sm}) {
+@media (min-width: breakpoints.$screen-sm) {
   h1 { font-size: 2.5em; }
   h2 { font-size: 2em; }
   h3 { font-size: 1.5em; }
@@ -48,8 +63,8 @@ p,
 li,
 td,
 label {
-  color: $grey-darker;
-  font-family: $font;
+  color: colours.$grey;
+  font-family: fonts.$font;
   font-weight: 400;
   line-height: 1.5em;
   margin: 0 0 0.8em;
@@ -57,39 +72,30 @@ label {
 
   @media screen {
     .knockout & {
-      color: $white;
+      color: colours.$white;
     }
   }
 }
 
-.overline {
-  margin: 0 0 0.125em;
-
-  @container (min-width: #{$screen-md}) {
-    font-size: 1.25em;
-  }
-}
-
 a {
-  color: $primary;
+  color: colours.$primary;
   text-decoration: none;
   outline: none;
   transition: all 300ms ease;
-  font-weight: bold;
 
   &:hover,
   &:focus {
-    color: $primary-dark;
+    color: colours.$primary-dark;
     text-decoration: none;
   }
 
   @media screen {
     .knockout & {
-      color: $white;
+      color: colours.$white;
 
       &:hover,
       &:focus {
-        color: $tertiary;
+        color: colours.$primary-light;
       }
     }
   }
@@ -125,12 +131,12 @@ ol {
 hr {
   margin: 1.5em auto 2em;
   height: 0;
-  border: 0 solid $grey-light;
-  border-width: $borderThin 0 0;
+  border: 0 solid colours.$grey-light;
+  border-width: spacing.$borderThin 0 0;
 
   @media screen {
     .knockout & {
-      border-color: $white;
+      border-color: colours.$white;
     }
   }
 }
@@ -144,47 +150,3 @@ hr {
     text-align: right;
   }
 }
-
-.wysiwyg {
-  >*:first-child {
-    margin-top: 0;
-  }
-
-  >*:last-child {
-    margin-bottom: 0;
-  }
-
-  a:not(.btn) {
-    text-decoration: underline;
-    font-weight: bold;
-  }
-}
-
-blockquote {
-  p {
-    font-family: $hfont;
-    font-weight: bold;
-    line-height: 1.2;
-  }
-
-  >*:first-child::before,
-  >*:last-child::after {
-    color: $secondary;
-    line-height: 1;
-    display: inline-block;
-    vertical-align: top;
-    transform: scale(1.5);
-  }
-
-  >*:first-child::before {
-    content: '\201C';
-    margin-right: 0.125em;
-    transform-origin: top right;
-  }
-
-  >*:last-child::after {
-    content: '\201D';
-    margin-left: 0.125em;
-    transform-origin: top left;
-  }
-}

web/app/themes/badegg/resources/css/global/_variables.scss

@@ -0,0 +1,3 @@
+@use "variables/colours";
+@use "variables/breakpoints";
+@use "variables/spacing";

web/app/themes/badegg/resources/css/global/framework/_breakpoints.scss

@@ -1,4 +1,6 @@
-@each $label, $value in $breakpoints {
+@use "../variables/breakpoints";
+
+@each $label, $value in breakpoints.$breakpoints {
   .min-#{$label} {
     @media (min-width: $value) {
       display: none;

web/app/themes/badegg/resources/css/global/framework/_colours.scss

@@ -0,0 +1,13 @@
+@use "../mixins/generate-button-classes";
+@use "../mixins/generate-colour-classes";
+@use "../variables/colours";
+
+::selection {
+  color: colours.$white;
+  background: colours.$primary;
+}
+
+@each $color, $hex in colours.$colors {
+  @include generate-colour-classes.generate_colour_classes($color, $hex);
+  @include generate-button-classes.generate_button_colors($color, $hex);
+}

web/app/themes/badegg/resources/css/global/framework/_normalise.scss

@@ -1,3 +1,5 @@
+@use "../variables/colours";
+
 * {
   box-sizing: border-box;
   backface-visibility: hidden; // removes jagged edges on rotated elements
@@ -5,14 +7,13 @@
 
 html {
   font-size: 16px;
-  scroll-behavior: smooth;
 }
 
 body,
 html {
   margin: 0;
   padding: 0;
-  background: $white;
+  background: colours.$white;
 }
 
 .visually-hidden {
@@ -32,10 +33,5 @@ img {
 
   &.lazy {
     filter: blur(0.25em);
-    opacity: 0;
   }
 }
-
-svg {
-  fill: currentColor;
-}

web/app/themes/badegg/resources/css/global/framework/_spacing.scss

@@ -0,0 +1,113 @@
+@use "../variables/colours";
+@use "../variables/spacing";
+
+.brand {
+  display: block;
+  width: spacing.$brandWidth;
+  height: spacing.$brandHeight;
+
+  svg,
+  img {
+    display: block;
+    width: spacing.$brandWidth;
+    height: spacing.$brandHeight;
+  }
+
+  .knockout & {
+    @media screen {
+      .fill-primary {
+        fill: colours.$white;
+      }
+
+      .fill-grey {
+        fill: rgba(colours.$white, 0.8);
+      }
+    }
+  }
+}
+
+.container {
+  width: 90%;
+  margin: auto;
+
+  &-large { max-width: spacing.$containerLarge; }
+  &-medium { max-width: spacing.$containerMedium; }
+  &-small { max-width: spacing.$containerSmall; }
+  &-narrow { max-width: spacing.$containerNarrow; }
+}
+
+.section {
+  padding: spacing.$sectionMedium 0;
+
+  &-small { padding: spacing.$sectionSmall 0; }
+  &-medium { padding: spacing.$sectionMedium 0; }
+  &-large { padding: spacing.$sectionLarge 0; }
+
+  &-zero-top { padding-top: 0; }
+  &-zero-bottom { padding-bottom: 0; }
+}
+
+.inner {
+  padding: spacing.$innerMedium;
+
+  &-small { padding: spacing.$innerSmall; }
+  &-large { padding: spacing.$innerLarge; }
+
+  &-zero-x {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  &-zero-y {
+    padding-top: 0;
+    padding-top: 0;
+  }
+}
+
+.rounded {
+  border-radius: spacing.$borderRadius;
+
+  &-top {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
+  &-bottom {
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+  }
+}
+
+.border {
+  border-style: solid;
+  border-width: spacing.$borderWidth;
+
+  &-thin { border-width: 0.0625em; }
+  &-regular { border-width: spacing.$borderWidth; }
+  &-thick { border-width: spacing.$borderThick; }
+  &-thicker { border-width: spacing.$borderThicker; }
+
+  &-top {
+    border-right-width: 0;
+    border-bottom-width: 0;
+    border-left-width: 0;
+  }
+
+  &-right {
+    border-top-width: 0;
+    border-bottom-width: 0;
+    border-left-width: 0;
+  }
+
+  &-bottom {
+    border-top-width: 0;
+    border-right-width: 0;
+    border-left-width: 0;
+  }
+
+  &-left {
+    border-top-width: 0;
+    border-right-width: 0;
+    border-bottom-width: 0;
+  }
+}

web/app/themes/badegg/resources/css/global/mixins/_generate-button-classes.scss

@@ -1,35 +1,37 @@
+@use "../variables/colours";
+
 @use "sass:color";
 
 @mixin generate_button_colors($name, $hex) {
 
   $buttons: (
-    ".btn",
+    ".button",
     "button",
     "input[type=submit]",
   );
 
   @each $button in $buttons {
     #{$button}.#{$name} {
-      @include text-contrast($hex);
+      color: colours.$white;
       background: $hex;
       border-color: $hex;
 
       &:hover,
       &:focus {
-        @include text-contrast($hex);
+        color: colours.$white;
         background: color.adjust($hex, $lightness: 10%);
         border-color: color.adjust($hex, $lightness: 10%);
       }
     }
 
     #{$button}.#{$name}.inverted {
-      @include text-contrast($hex);
+      color: $hex;
       background: transparent;
       border-color: $hex;
 
       &:hover,
       &:focus {
-        @include text-contrast($hex);
+        color: white;
         background: #{$hex};
         border-color: #{$hex};
       }
@@ -37,26 +39,26 @@
 
     @media screen {
       *:not(.bg-#{$name}) #{$button}.#{$name} {
-        @include text-contrast($hex);
+        color: white;
         background-color: $hex;
         border-color: $hex;
 
         &:hover,
         &:focus {
-          @include text-contrast($hex);
+          color: white;
           background-color: color.adjust($hex, $lightness: 10%);
           border-color: color.adjust($hex, $lightness: 10%);
         }
       }
 
       .bg-#{$name} #{$button}.#{$name} {
-        @include text-contrast($hex);
+        color: $hex;
         background: white;
         border-color: white;
 
         &:hover,
         &:focus {
-          @include text-contrast($hex);
+          color: white;
           background: transparent;
           border-color: white;
         }

web/app/themes/badegg/resources/css/global/mixins/_generate-colour-classes.scss

@@ -1,8 +1,8 @@
+@use "text-contrast";
+
 @use "sass:color";
 
 @mixin generate_colour_classes($name, $hex) {
-
-  .knockout .#{$name},
   .#{$name} {
     color: $hex;
   }
@@ -20,7 +20,7 @@
       background-color: $hex;
 
       ::selection {
-        @include text_contrast(color.invert($hex));
+        @include text-contrast.text_contrast(color.invert($hex));
         background: color.invert($hex);
       }
     }

web/app/themes/badegg/resources/css/global/mixins/_linear-gradient.scss

@@ -1,5 +1,3 @@
-@use "sass:list";
-
 // define as many $color-stops as needed
 @mixin linear-gradient($direction, $color-stops...) {
   background: list.nth(list.nth($color-stops, 1), 1);

web/app/themes/badegg/resources/css/global/mixins/_text-contrast.scss

@@ -0,0 +1,17 @@
+@use "../variables/colours";
+
+@use "sass:color";
+@use "sass:math";
+
+@mixin text-contrast($n, $dark: colours.$black, $light: colours.$white, $cutoff: 1.667) {
+  $brightness: math.round((color.channel($n, "red") * 299) + (color.channel($n, "green") * 587) + math.div((color.channel($n, "blue") * 114), 1000));
+  $light-color: math.round((color.channel(colours.$white, "red") * 299) + (color.channel(colours.$white, "green") * 587) + math.div((color.channel(colours.$white, "blue") * 114), 1000));
+
+  @if math.abs($brightness) < (math.div($light-color, $cutoff)) {
+    color: $light;
+  }
+
+  @else {
+    color: $dark;
+  }
+}

web/app/themes/badegg/resources/css/global/variables/_colours.scss

@@ -0,0 +1,105 @@
+@use "sass:color";
+
+//== Status
+$success: #39b54a;
+$error: #be1e2d;
+$alert: #eed202;
+
+//== Brand Colours
+$primary: #337ab7;
+$secondary: #5bc0de;
+$tertiary: color.invert($primary);
+$quaternary: color.invert($secondary);
+
+//== Primary Tints
+$primary-darkest: color.adjust($primary, $lightness: -30%);
+$primary-darker: color.adjust($primary, $lightness: -20%);
+$primary-dark: color.adjust($primary, $lightness: -10%);
+$primary-light: color.adjust($primary, $lightness: 10%);
+$primary-lighter: color.adjust($primary, $lightness: 20%);
+$primary-lightest: color.adjust($primary, $lightness: 30%);
+
+//== Secondary Tints
+$secondary-darkest: color.adjust($secondary, $lightness: -30%);
+$secondary-darker: color.adjust($secondary, $lightness: -20%);
+$secondary-dark: color.adjust($secondary, $lightness: -10%);
+$secondary-light: color.adjust($secondary, $lightness: 10%);
+$secondary-lighter: color.adjust($secondary, $lightness: 20%);
+$secondary-lightest: color.adjust($secondary, $lightness: 30%);
+
+//== Tertiary Tints
+$tertiary-darkest: color.adjust($tertiary, $lightness: -30%);
+$tertiary-darker: color.adjust($tertiary, $lightness: -20%);
+$tertiary-dark: color.adjust($tertiary, $lightness: -10%);
+$tertiary-light: color.adjust($tertiary, $lightness: 10%);
+$tertiary-lighter: color.adjust($tertiary, $lightness: 20%);
+$tertiary-lightest: color.adjust($tertiary, $lightness: 30%);
+
+//== quaternary Tints
+$quaternary-darkest: color.adjust($quaternary, $lightness: -30%);
+$quaternary-darker: color.adjust($quaternary, $lightness: -20%);
+$quaternary-dark: color.adjust($quaternary, $lightness: -10%);
+$quaternary-light: color.adjust($quaternary, $lightness: 10%);
+$quaternary-lighter: color.adjust($quaternary, $lightness: 20%);
+$quaternary-lightest: color.adjust($quaternary, $lightness: 30%);
+
+//== Shades
+$white:               white;
+$grey-lightest:       color.adjust(black, $lightness: 95%);
+$grey-lighter:        color.adjust(black, $lightness: 80%);
+$grey-light:          color.adjust(black, $lightness: 70%);
+$grey:                color.adjust(black, $lightness: 50%);
+$grey-dark:           color.adjust(black, $lightness: 40%);
+$grey-darker:         color.adjust(black, $lightness: 20%);
+$grey-darkest:        color.adjust(black, $lightness: 05%);
+$black:               black;
+
+//## Colour Array (used in generating colour classes).
+$colors: (
+  // shades
+  "black":     $black,
+  "grey-darkest": $grey-darkest,
+  "grey-darker": $grey-darker,
+  "grey-dark": $grey-dark,
+  "grey-light": $grey-light,
+  "grey-lighter": $grey-lighter,
+  "grey-lightest": $grey-lightest,
+  "white":     $white,
+  // status
+  "error":      $error,
+  "success":    $success,
+  "alert":      $alert,
+  // brand
+  "primary":    $primary,
+  "secondary":  $secondary,
+  "tertiary":   $tertiary,
+  "quaternary":   $quaternary,
+  // primary tints
+  "primary-darkest":  $primary-darkest,
+  "primary-darker":   $primary-darker,
+  "primary-dark":     $primary-dark,
+  "primary-light":    $primary-light,
+  "primary-lighter":  $primary-lighter,
+  "primary-lightest": $primary-lightest,
+  // secondary tints
+  "secondary-darkest":  $secondary-darkest,
+  "secondary-darker":   $secondary-darker,
+  "secondary-dark":     $secondary-dark,
+  "secondary-light":    $secondary-light,
+  "secondary-lighter":  $secondary-lighter,
+  "secondary-lightest": $secondary-lightest,
+  // tertiary tints
+  "tertiary-darkest":  $tertiary-darkest,
+  "tertiary-darker":   $tertiary-darker,
+  "tertiary-dark":     $tertiary-dark,
+  "tertiary-light":    $tertiary-light,
+  "tertiary-lighter":  $tertiary-lighter,
+  "tertiary-lightest": $tertiary-lightest,
+  // quaternary tints
+  "quaternary-darkest":  $quaternary-darkest,
+  "quaternary-darker":   $quaternary-darker,
+  "quaternary-dark":     $quaternary-dark,
+  "quaternary-light":    $quaternary-light,
+  "quaternary-lighter":  $quaternary-lighter,
+  "quaternary-lightest": $quaternary-lightest,
+);

web/app/themes/badegg/resources/css/global/variables/_spacing.scss

@@ -2,8 +2,8 @@
 
 $offCanvasWidth:      17.5em;
 
-$brandWidth:          7.46875em !default;
-// $brandHeight:         1.835em !default;
+$brandWidth:          9em !default;
+$brandHeight:         3em !default;
 
 $tileAspectRatio:     math.div(400, 640) * 100%;
 $heroAspectRatio:     math.div(593, 1920) * 100vw;
@@ -41,6 +41,3 @@ $borderWidth:          0.1250em;
 $borderThick:          0.2500em;
 $borderThicker:        0.5000em;
 $borderThickest:       1.0000em;
-
-$angleHeight:          6.667cqw;
-$angleHeightSmall:     3.472cqw;

web/app/themes/badegg/resources/css/plugins/_contact-form-7.scss

@@ -0,0 +1,24 @@
+@use "../global/variables/colours";
+
+.wpcf7 .screen-reader-response {
+  display: none;
+}
+
+.wpcf7-response-output {
+  @extend p !optional;
+  @extend .container !optional;
+  @extend .container-narrow !optional;
+
+  padding: 1em 0 0;
+  margin-top: 2em;
+  border: 1px solid colours.$grey-light;
+  border-width: 1px 0 0;
+
+  .knockout & {
+    border-color: rgba(colours.$white, 0.3);
+  }
+}
+
+.wpcf7-display-none {
+  display: none;
+}

web/app/themes/badegg/resources/css/plugins/_mce.scss

@@ -1,12 +1,14 @@
+@use "../global/variables/colours";
+
 #mce-responses {
   .response {
     padding: 0 0 1em;
     margin: 0 0 1em;
     font-size: 0.875em;
-    border-bottom: 1px solid $grey-lighter;
+    border-bottom: 1px solid colours.$grey-lighter;
   }
 }
 
 .knockout #mce-responses .response {
-  border-bottom-color: rgba($white, 0.3);
+  border-bottom-color: rgba(colours.$white, 0.3);
 }

web/app/themes/badegg/resources/js/app.js

@@ -0,0 +1,18 @@
+import.meta.glob([
+  '../images/**',
+  '../fonts/**',
+]);
+
+import domReady from '@wordpress/dom-ready';
+import blocks from './blocks.js';
+import Header from './sections/header.js';
+import LazyLoad from './lib/Lazy.js';
+
+/**
+ * Application entrypoint
+ */
+domReady(async () => {
+  LazyLoad();
+  blocks();
+  Header();
+});

web/app/themes/badegg/resources/js/blocks.js

@@ -0,0 +1,6 @@
+import BadExample from "./blocks/BadExample";
+
+export default function()
+{
+  BadExample();
+}

web/app/themes/badegg/resources/js/blocks/BadExample.js

@@ -0,0 +1,4 @@
+export default function BadExample()
+{
+
+}

web/app/themes/badegg/resources/js/editor.js

@@ -0,0 +1,5 @@
+import domReady from '@wordpress/dom-ready';
+
+domReady(() => {
+  //
+});

web/app/themes/badegg/resources/js/sections/header.js

@@ -0,0 +1,33 @@
+export default function Header() {
+  const body = document.querySelector("body");
+  // const menuToggle = document.querySelector(".js-menu-toggle");
+  // const menuClose = document.querySelector(".js-menu-close");
+
+  // menuToggle.addEventListener("click", (e) => {
+  //   e.preventDefault();
+  //   body.classList.toggle("menu-open");
+  // });
+
+  // menuClose.addEventListener("click", (e) => {
+  //   e.preventDefault();
+  //   body.classList.remove("menu-open");
+  // });
+
+  // document.addEventListener("keyup", function (event) {
+  //   if (event.key === "Escape") {
+  //     body.classList.remove("menu-open");
+  //   }
+  // });
+
+  document.addEventListener("scroll", () => {
+    const scrolled = document.scrollingElement.scrollTop;
+    const position = body.offsetTop;
+    const header = document.querySelector(".site-header");
+
+    if (scrolled > position + header.offsetHeight) {
+      body.classList.add("scrolled");
+    } else {
+      body.classList.remove("scrolled");
+    }
+  });
+}

web/app/themes/badegg/resources/scripts/app.js

@@ -1,22 +0,0 @@
-import domReady from '@roots/sage/client/dom-ready';
-import Header from '../views/sections/header/header';
-import Footer from '../views/sections/footer/footer';
-import blocks from './blocks.js';
-import LazyLoad from './lib/Lazy.js';
-import Accordion from './lib/Accordion.js';
-
-/**
- * Application entrypoint
- */
-domReady(async () => {
-  LazyLoad();
-  Accordion();
-  Header();
-  Footer();
-  blocks();
-});
-
-/**
- * @see {@link https://webpack.js.org/api/hot-module-replacement/}
- */
-if (import.meta.webpackHot) import.meta.webpackHot.accept(console.error);

web/app/themes/badegg/resources/scripts/blocks.js

@@ -1,6 +0,0 @@
-import WYSIWYG from '../views/blocks/WYSIWYG/WYSIWYG';
-
-export default function()
-{
-  WYSIWYG();
-}

web/app/themes/badegg/resources/scripts/editor.js

@@ -1,9 +0,0 @@
-/**
- * @see {@link https://bud.js.org/extensions/bud-preset-wordpress/editor-integration/filters}
- */
-roots.register.filters('@scripts/filters');
-
-/**
- * @see {@link https://webpack.js.org/api/hot-module-replacement/}
- */
-if (import.meta.webpackHot) import.meta.webpackHot.accept(console.error);

web/app/themes/badegg/resources/scripts/filters/button.filter.js

@@ -1,25 +0,0 @@
-/**
- * @see {@link https://developer.wordpress.org/block-editor/reference-guides/filters/block-filters/#blocks-registerblocktype}
- */
-export const hook = 'blocks.registerBlockType';
-
-/**
- * Filter handle
- */
-export const name = 'sage/button';
-
-/**
- * Filter callback
- *
- * @param {object} settings
- * @param {string} name
- * @returns modified settings
- */
-export function callback(settings, name) {
-  if (name !== 'core/button') return settings;
-
-  return {
-    ...settings,
-    styles: [{ label: 'Outline', name: 'outline' }],
-  };
-}

web/app/themes/badegg/resources/scripts/lib/Accordion.js

@@ -1,15 +0,0 @@
-export default function Accordion()
-{
-  const accordions = document.querySelectorAll(".js-accordion");
-
-  if(!accordions) return;
-
-  accordions.forEach(accordion => {
-    const question = accordion.querySelector(".js-accordion-toggle");
-
-    question.addEventListener("click", function(e) {
-      e.preventDefault();
-      accordion.classList.toggle("open");
-    });
-  });
-}

web/app/themes/badegg/resources/styles/app.scss

@@ -1,28 +0,0 @@
-$fa-font-path: "~/fonts";
-
-@import "@fortawesome/fontawesome-free/scss/fontawesome";
-// @import "@fortawesome/fontawesome-free/scss/solid";
-// @import "@fortawesome/fontawesome-free/scss/brands";
-
-// Global Variables, Mixins, and Framework
-@import "global/variables";
-@import "global/mixins";
-@import "global/fonts";
-@import "global/typography";
-@import "global/framework";
-
-// Components
-@import "components/forms";
-@import "components/button";
-@import "components/card";
-
-// Third Party Plugins
-@import "plugins/contact-form-7";
-@import "plugins/mce";
-
-// Sections
-@import "../views/sections/header/header";
-@import "../views/sections/footer/footer";
-
-// Blocks
-@import "../views/blocks/WYSIWYG/WYSIWYG";

web/app/themes/badegg/resources/styles/editor.scss

@@ -1,65 +0,0 @@
-@import "app";
-
-body {
-  &.template-plain-document {
-    .editor-styles-wrapper {
-      max-width: $containerMedium;
-      margin: auto;
-    }
-  }
-
-  .editor-visual-editor {
-    background: $white;
-  }
-
-  .editor-styles-wrapper {
-    padding: 2rem !important;
-  }
-
-  &:not(.template-plain-document) {
-    .editor-styles-wrapper {
-      background: transparent;
-    }
-
-    .editor-visual-editor {
-      background-image: url('~images/pattern-fabric-of-squares-gray.png');
-      background-size: 200px;
-      background-attachment: fixed;
-
-      &__post-title-wrapper {
-        padding: 1rem;
-        margin: 0 0 3rem !important;
-        background: $white;
-        box-shadow: 0 0.5rem 1rem rgba($black, 0.15);
-      }
-    }
-
-    .wp-block-post-title {
-      position: relative;
-      padding: 0.5rem;
-      border: $borderThin solid $grey-lighter;
-      margin: 0;
-
-      &::before {
-        content: 'Page Title';
-        position: absolute;
-        top: -0.5rem;
-        left: 0.5rem;
-        color: $grey-lighter;
-        font-family: $font;
-        font-size: 0.8rem;
-        display: block;
-        padding: 0 0.5rem;
-        margin: 0;
-        background: $white;
-        line-height: 1;
-        font-weight: 400;
-      }
-    }
-
-    .wp-block-post-content {
-      background: $white;
-      box-shadow: 0 0.5rem 1rem rgba($black, 0.15);
-    }
-  }
-}

web/app/themes/badegg/resources/styles/global/_fonts.scss

@@ -1,18 +0,0 @@
-$hfont: Times, 'Times New Roman', serif;
-$font: Helvetica, Arial, sans-serif;
-
-/*
- * Roots Fonts Setup
- * https://roots.io/sage/docs/fonts-setup/
- *
- * Self-Hosted Google Fonts (Ubuntu Demo)
- * https://gwfh.mranftl.com/fonts/ubuntu?subsets=latin
- *
- * Add the font to your Tailwind config
- * tailwind.config.cjs
- *
- * Configure theme.json to use the font with Bud
- */
-
-/* stylelint-disable */
-

web/app/themes/badegg/resources/styles/global/_framework.scss

@@ -1,17 +0,0 @@
-@import "framework/breakpoints";
-@import "framework/normalise";
-@import "framework/colours";
-@import "framework/spacing";
-
-.socials {
-  font-size: 1.5em;
-
-  li {
-    display: inline-block;
-  }
-
-  a {
-    display: block;
-    padding: 0.125em;
-  }
-}