generator-chisel 2.0.0-alpha.3 → 2.0.0-alpha.5

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 <!-- INSERT-NEW-ENTRIES-HERE -->
 
+## 2.0.0-alpha.5 (2024-09-27)
+
+- bugs fixes, blocks mods, adjustments ([5a2b460](https://github.com/xfiveco/generator-chisel/commit/5a2b460))
+
+## 2.0.0-alpha.4 (2024-09-16)
+
+- adjust plugins ([bc2343a](https://github.com/xfiveco/generator-chisel/commit/bc2343a))
+- bug fixes, phpcs and twigcs fixes ([118297b](https://github.com/xfiveco/generator-chisel/commit/118297b))
+- remove lint staged (it is in coding standards) ([e51b4b6](https://github.com/xfiveco/generator-chisel/commit/e51b4b6))
+- remove unnecessary gitignore ([f48e528](https://github.com/xfiveco/generator-chisel/commit/f48e528))
+- scripts enqueueing fixes ([5a8badf](https://github.com/xfiveco/generator-chisel/commit/5a8badf))
+- theme gitignore update ([9ef8d60](https://github.com/xfiveco/generator-chisel/commit/9ef8d60))
+- twig cs adjustments ([84493cd](https://github.com/xfiveco/generator-chisel/commit/84493cd))
+
 ## 2.0.0-alpha.3 (2024-09-13)
 
 - refactor, adjustments, css spliting, comments, 3rd party integration classes ([e1fe3cd](https://github.com/xfiveco/generator-chisel/commit/e1fe3cd))

package/lib/commands/create/creators/app/chisel-starter-theme/.gitignore.chisel-tpl

@@ -1 +1,2 @@
 /build
+/vendor

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Ajax.php

@@ -97,11 +97,8 @@ class Ajax extends \WP_REST_Controller implements Instance {
 	 * @return callable
 	 */
 	public function callback( $request ) {
-			$route       = $request->get_route();
-			$route_parts = explode( '/', $route );
-			$callback    = str_replace( '-', '_', end( $route_parts ) );
-
-			$ajax_endpoints = new AjaxEnpoints();
+		$callback       = self::get_callback_name( $request );
+		$ajax_endpoints = new AjaxEnpoints();
 
 		if ( method_exists( $ajax_endpoints, $callback ) ) {
 			if ( ! defined( 'DOING_AJAX' ) ) {
@@ -124,7 +121,9 @@ class Ajax extends \WP_REST_Controller implements Instance {
 	 * @return boolean
 	 */
 	public function permissions_check( $request ) {
-		return true;
+		$permission = apply_filters( 'chisel_ajax_permissions_check', true, self::get_callback_name( $request ), $request );
+
+		return $permission;
 	}
 
 	/**
@@ -147,6 +146,21 @@ class Ajax extends \WP_REST_Controller implements Instance {
 		return (array) json_decode( stripslashes( $value ) );
 	}
 
+	/**
+	 * Get callback name from ajax request.
+	 *
+	 * @param \WP_REST_Request $request
+	 *
+	 * @return string
+	 */
+	public static function get_callback_name( $request ) {
+		$route       = $request->get_route();
+		$route_parts = explode( '/', $route );
+		$callback    = str_replace( '-', '_', end( $route_parts ) );
+
+		return $callback;
+	}
+
 	/**
 	 * Get the instance of the class.
 	 */

package/lib/commands/create/creators/app/chisel-starter-theme/classes/AjaxEnpoints.php

@@ -40,7 +40,7 @@ class AjaxEnpoints {
 			)
 		);
 
-		$templates = array( 'components/post-item.twig', 'components/' . $post_type . '-item.twig' );
+		$templates = array( 'components/' . $post_type . '-item.twig', 'components/post-item.twig' );
 
 		if ( $post_type === 'product' ) {
 			array_unshift( $templates, 'woocommerce/content-product.twig' );

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Assets.php

@@ -127,7 +127,7 @@ class Assets implements Instance {
 						'localize' => array(
 							'name' => 'chiselScripts',
 							'data' => array(
-								'logoData' => Helpers::get_login_page_logo_url(),
+								'logoData' => Helpers::get_login_page_logo_data(),
 							),
 						),
 					),
@@ -155,7 +155,17 @@ class Assets implements Instance {
 			);
 
 			$this->editor_scripts = array(
-				'editor' => array(),
+				'editor' => array(
+					'localize' => array(
+						'name' => 'chiselEditorScripts',
+						'data' => array(
+							'icons' => array(
+								'minus' => __( 'Minus', 'chisel' ),
+								'plus'  => __( 'Plus', 'chisel' ),
+							),
+						),
+					),
+				),
 			);
 		}
 	}
@@ -259,9 +269,10 @@ class Assets implements Instance {
 		if ( $this->frontend_styles ) {
 			foreach ( $this->frontend_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_frontend_style', true, $handle, $args );
+				$style_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_style ) {
-					wp_enqueue_style( self::get_final_handle( $handle ) );
+				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
+					wp_enqueue_style( $style_handle );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -272,9 +283,10 @@ class Assets implements Instance {
 		if ( $this->frontend_scripts ) {
 			foreach ( $this->frontend_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_frontend_script', true, $handle, $args );
+				$script_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_script ) {
-					wp_enqueue_script( self::get_final_handle( $handle ) );
+				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
+					wp_enqueue_script( $script_handle );
 					$this->set_script_translations( $handle, $args );
 				}
 			}
@@ -291,9 +303,10 @@ class Assets implements Instance {
 		if ( $this->admin_styles ) {
 			foreach ( $this->admin_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_admin_style', true, $handle, $args );
+				$style_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_style ) {
-					wp_enqueue_style( self::get_final_handle( $handle ) );
+				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
+					wp_enqueue_style( $style_handle );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -304,9 +317,10 @@ class Assets implements Instance {
 		if ( $this->admin_scripts ) {
 			foreach ( $this->admin_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_admin_script', true, $handle, $args );
+				$script_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_script ) {
-					wp_enqueue_script( self::get_final_handle( $handle ) );
+				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
+					wp_enqueue_script( $script_handle );
 					$this->set_script_translations( $handle, $args );
 				}
 			}
@@ -323,9 +337,10 @@ class Assets implements Instance {
 		if ( $this->editor_styles ) {
 			foreach ( $this->editor_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_editor_style', true, $handle, $args );
+				$style_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_style ) {
-					wp_enqueue_style( self::get_final_handle( $handle ) );
+				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
+					wp_enqueue_style( $style_handle );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -336,9 +351,10 @@ class Assets implements Instance {
 		if ( $this->editor_scripts ) {
 			foreach ( $this->editor_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_editor_script', true, $handle, $args );
+				$script_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_script ) {
-					wp_enqueue_script( self::get_final_handle( $handle ) );
+				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
+					wp_enqueue_script( $script_handle );
 					$this->set_script_translations( $handle, $args );
 				}
 			}
@@ -364,9 +380,10 @@ class Assets implements Instance {
 		if ( $this->login_styles ) {
 			foreach ( $this->login_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_login_style', true, $handle, $args );
+				$style_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_style ) {
-					wp_enqueue_style( self::get_final_handle( $handle ) );
+				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
+					wp_enqueue_style( $style_handle );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -377,9 +394,10 @@ class Assets implements Instance {
 		if ( $this->login_scripts ) {
 			foreach ( $this->login_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_login_script', true, $handle, $args );
+				$script_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_script ) {
-					wp_enqueue_script( self::get_final_handle( $handle ) );
+				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
+					wp_enqueue_script( $script_handle );
 					$this->set_script_translations( $handle, $args );
 				}
 			}

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Comments.php

@@ -207,11 +207,15 @@ class Comments implements Instance {
 		<script>
 			wp.domReady( () => {
 				const blockType = 'core/latest-comments';
-				if ( wp.blocks && wp.data && wp.data.select( 'core/blocks' ).getBlockType( blockType ) ){
+				if (!wp?.data) {
+					return;
+				}
+
+				if ( wp?.blocks && wp.data && wp.data.select( 'core/blocks' ).getBlockType( blockType ) ){
 					wp.blocks.unregisterBlockType( blockType );
 				}
 
-				wp.data.dispatch( 'core/edit-post').removeEditorPanel( 'discussion-panel' ); // Discussion
+				wp.data.dispatch( 'core/edit-post')?.removeEditorPanel( 'discussion-panel' ); // Discussion
 			} );
 		</script>
 		<?php

package/lib/commands/create/creators/app/chisel-starter-theme/classes/GravityForms.php

@@ -40,6 +40,8 @@ class GravityForms implements Instance {
 	public function filter_hooks() {
 		add_filter( 'chisel_frontend_styles', array( $this, 'register_custom_styles' ) );
 		add_filter( 'chisel_enqueue_frontend_style', array( $this, 'enqueue_custom_styles' ), 10, 3 );
+		add_filter( 'gform_form_theme_slug', array( $this, 'default_form_styles' ), 99, 2 );
+		add_filter( 'gform_plugin_settings_fields', array( $this, 'plugin_settings_fields' ), 99 );
 	}
 
 	/**
@@ -85,6 +87,35 @@ class GravityForms implements Instance {
 		return $enqueue;
 	}
 
+	/**
+	 * Set default form styles for all forms so that our custom styles can be used.
+	 *
+	 * @param string $slug
+	 * @param array  $form
+	 *
+	 * @return string
+	 */
+	public function default_form_styles( $slug, $form ) {
+		$slug = 'gravity-theme';
+
+		return $slug;
+	}
+
+	/**
+	 * Remove default theme settings so that we can use our custom styles.
+	 *
+	 * @param array $fields
+	 *
+	 * @return array
+	 */
+	public function plugin_settings_fields( $fields ) {
+		if ( isset( $fields['default_theme'] ) ) {
+			unset( $fields['default_theme'] );
+		}
+
+		return $fields;
+	}
+
 	/**
 	 * Check if Gravity Forms plugin is active.
 	 *

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Helpers.php

@@ -116,20 +116,25 @@ class Helpers {
 	}
 
 	/**
-	 * Get logo url for the wp login page.
+	 * Get logo data for the wp login page.
 	 *
-	 * @return string
+	 * @return array
 	 */
-	public static function get_login_page_logo_url() {
-		$logo_url = '';
-		$logo_id  = get_theme_mod( 'custom_logo', 0 );
+	public static function get_login_page_logo_data() {
+		$logo_id   = get_theme_mod( 'custom_logo', 0 );
+		$logo_data = array();
 
 		if ( $logo_id ) {
-			$logo_url = wp_get_attachment_image_url( $logo_id, 'medium' );
+			$logo_data = wp_get_attachment_image_src( $logo_id, 'medium' );
 		} else {
-			$logo_url = self::get_image_url( 'chisel.png' );
+			$logo_data = array(
+				self::get_image_url( 'chisel.png' ),
+				84,
+				84,
+				0,
+			);
 		}
 
-		return $logo_url;
+		return $logo_data;
 	}
 }

package/lib/commands/create/creators/app/chisel-starter-theme/classes/RegisterBlocks.php

@@ -189,7 +189,7 @@ abstract class RegisterBlocks {
 									$block
 								);
 
-								if ( ! in_array( $script, $ignore_scripts ) ) {
+								if ( ! in_array( $script, $ignore_scripts, true ) ) {
 									wp_register_script(
 										$block_handle,
 										$file_url,

package/lib/commands/create/creators/app/chisel-starter-theme/src/blocks-acf/slider/slider.twig

@@ -1,12 +1,12 @@
-{% set slidesHtml = '' %}
+{% set slides_html = '' %}
 
 <div {{ wrapper_attributes }} data-block-id="{{ block.id }}">
   <div class="b-slider__inner alignfull">
     {% if fields.acf_block_slider_slides is not empty %}
       {% for slide in fields.acf_block_slider_slides %}
         {% if slide.acf_bs_image %}
-          {% set slidesHtml %}
-            {{slidesHtml}}
+          {% set slides_html %}
+            {{ slides_html }}
             <div class="b-slider__slide swiper-slide" data-thumbnail-url="{{ get_image(slide.acf_bs_image).src('medium') }}">
               {{ get_responsive_image(slide.acf_bs_image, 'large') }}
             </div>
@@ -15,7 +15,7 @@
       {% endfor %}
 
       {% include 'components/slider.twig' with {
-        slidesHtml,
+        slides_html,
         params: {
           'slides-per-view': 1,
           block_settings: fields.slider_options

package/lib/commands/create/creators/app/chisel-starter-theme/src/design/tools/_buttons.scss

@@ -3,7 +3,9 @@
 @use 'px-to-rem' as *;
 
 @mixin button() {
+  box-sizing: border-box;
   display: inline-flex;
+  align-items: center;
   padding: get-padding('small') get-padding('medium');
   font-size: get-font-size('normal');
   font-weight: 400;
@@ -14,6 +16,21 @@
   border: 1px solid transparent;
   border-radius: get-border-radius('little');
   transition: get-transition('normal');
+
+  &::after {
+    transition: get-transition('normal');
+  }
+}
+
+@mixin button-disabled() {
+  pointer-events: none;
+  cursor: default;
+  opacity: 0.5;
+}
+
+@mixin button-icon() {
+  padding-top: px-rem(14);
+  padding-bottom: px-rem(14);
 }
 
 @mixin button-primary() {
@@ -28,6 +45,12 @@
   border-color: get-color('secondary');
 }
 
+@mixin button-primary-icon() {
+  &::after {
+    background-color: get-color('white');
+  }
+}
+
 @mixin button-primary-outline() {
   color: get-color('primary');
   background-color: transparent;
@@ -40,6 +63,18 @@
   border-color: get-color('primary');
 }
 
+@mixin button-primary-outline-icon() {
+  &::after {
+    background-color: get-color('primary');
+  }
+}
+
+@mixin button-primary-outline-icon-hover() {
+  &::after {
+    background-color: get-color('white');
+  }
+}
+
 @mixin button-secondary() {
   color: get-color('white');
   background-color: get-color('secondary');
@@ -64,6 +99,18 @@
   border-color: get-color('secondary');
 }
 
+@mixin button-secondary-outline-icon() {
+  &::after {
+    background-color: get-color('secondary');
+  }
+}
+
+@mixin button-secondary-outline-icon-hover() {
+  &::after {
+    background-color: get-color('white');
+  }
+}
+
 @mixin button-tertiary() {
   color: get-color('white');
   background-color: get-color('black');
@@ -88,8 +135,26 @@
   border-color: get-color('black');
 }
 
+@mixin button-tertiary-outline-icon() {
+  &::after {
+    background-color: get-color('black');
+  }
+}
+
+@mixin button-tertiary-outline-icon-hover() {
+  &::after {
+    background-color: get-color('white');
+  }
+}
+
 @mixin button-small() {
   padding: get-padding('little') get-padding('normal');
+  font-size: get-font-size('small');
+  line-height: get-line-height('normal');
+}
+
+@mixin button-large() {
+  padding: get-padding('normal') get-padding('large');
 }
 
 @mixin button-loading($color: currentColor) {

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/editor/blocks-mods.js

@@ -0,0 +1,2 @@
+import './mods/core-button';
+import './mods/core-spacer';

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/editor/blocks.js

@@ -1,6 +1,3 @@
-import { addFilter } from '@wordpress/hooks';
-import { createHigherOrderComponent } from '@wordpress/compose';
-import { useEffect } from '@wordpress/element';
 import { select, subscribe } from '@wordpress/data';
 
 class Blocks {
@@ -28,28 +25,3 @@ class Blocks {
 }
 
 new Blocks();
-
-addFilter(
-  'editor.BlockEdit',
-  'chisel/blocks/blockEdit',
-  createHigherOrderComponent((BlockEdit) => {
-    return (props) => {
-      const { setAttributes, attributes, name } = props;
-
-      useEffect(() => {
-        if (name === 'core/spacer') {
-          setAttributes({
-            height: 'auto',
-          });
-        }
-      }, [attributes?.height]);
-
-      return (
-        <>
-          <BlockEdit key="edit" {...props} />
-        </>
-      );
-    };
-  }, 'chisel/blocks/blockEdit'),
-  10,
-);

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/editor/mods/core-button.js

@@ -0,0 +1,103 @@
+import { __ } from '@wordpress/i18n';
+import { addFilter } from '@wordpress/hooks';
+import { createHigherOrderComponent } from '@wordpress/compose';
+import { Fragment } from '@wordpress/element';
+import { PanelBody, SelectControl } from '@wordpress/components';
+import { InspectorControls } from '@wordpress/blockEditor';
+import Utils from '../utils';
+
+const blockName = 'core/button';
+const buttonSizes = [
+  { label: __('Small', 'chisel'), value: 'small' },
+  { label: __('Default', 'chisel'), value: '' },
+  { label: __('Large', 'chisel'), value: 'large' },
+];
+const buttonIcons = [
+  {
+    label: __('None', 'chisel'),
+    value: '',
+  },
+  ...Utils.generateIconsChoices(),
+];
+const buttonSizesClassNamesRegex = Utils.generateClassNamesRegex(buttonSizes, 'is-size');
+const buttonIconsClassNamesRegex = Utils.generateClassNamesRegex(buttonIcons, 'has-icon');
+
+// Add Custom Attributes
+const chiselButtonBlockAttributes = (settings, name) => {
+  if (name === blockName) {
+    settings = Object.assign({}, settings, {
+      attributes: Object.assign({}, settings.attributes, {
+        buttonSize: {
+          type: 'string',
+          default: '',
+        },
+        buttonIcon: {
+          type: 'string',
+          default: '',
+        },
+      }),
+    });
+  }
+
+  return settings;
+};
+addFilter('blocks.registerBlockType', 'chisel/button-block', chiselButtonBlockAttributes);
+
+const chiselButtonCustomControls = createHigherOrderComponent((BlockEdit) => {
+  return (props) => {
+    const { attributes, setAttributes, isSelected } = props;
+
+    let { buttonSize = '', className = '', buttonIcon = '' } = attributes;
+
+    return (
+      <Fragment>
+        <BlockEdit {...props} />
+
+        {isSelected && props.name === blockName && (
+          <InspectorControls>
+            <PanelBody title={__('Button Size', 'lps')}>
+              <SelectControl
+                label={__('Size', 'lps')}
+                options={buttonSizes}
+                value={buttonSize}
+                onChange={(value) => {
+                  className = Utils.prepareClassName(className, buttonSizesClassNamesRegex);
+
+                  if (value) {
+                    className += ` ${`is-size-${value}`}`;
+                  }
+
+                  setAttributes({
+                    buttonSize: value,
+                    className,
+                  });
+                }}
+              />
+            </PanelBody>
+            <PanelBody title={__('Button Icon', 'lps')}>
+              <SelectControl
+                label={__('Icon', 'lps')}
+                options={buttonIcons}
+                value={buttonIcon}
+                onChange={(value) => {
+                  className = Utils.prepareClassName(className, buttonIconsClassNamesRegex);
+                  className = className.replace('has-icon', '').trim();
+
+                  if (value) {
+                    className += ` has-icon ${`has-icon-${value}`}`;
+                  }
+
+                  setAttributes({
+                    buttonIcon: value,
+                    className,
+                  });
+                }}
+              />
+            </PanelBody>
+          </InspectorControls>
+        )}
+      </Fragment>
+    );
+  };
+}, 'coreButtonCustomControls');
+addFilter('editor.BlockEdit', 'chisel/button-block', chiselButtonCustomControls);

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/editor/mods/core-spacer.js

@@ -0,0 +1,28 @@
+import { addFilter } from '@wordpress/hooks';
+import { createHigherOrderComponent } from '@wordpress/compose';
+import { useEffect } from '@wordpress/element';
+
+addFilter(
+  'editor.BlockEdit',
+  'chisel/blocks/blockEdit',
+  createHigherOrderComponent((BlockEdit) => {
+    return (props) => {
+      const { setAttributes, attributes, name } = props;
+
+      useEffect(() => {
+        if (name === 'core/spacer') {
+          setAttributes({
+            height: 'auto',
+          });
+        }
+      }, [attributes?.height]);
+
+      return (
+        <>
+          <BlockEdit key="edit" {...props} />
+        </>
+      );
+    };
+  }, 'chisel/blocks/blockEdit'),
+  10,
+);

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/editor/utils.js

@@ -0,0 +1,36 @@
+/* global chiselEditorScripts */
+
+class Utils {
+  generateClassNamesRegex = (options, classPrefix) => {
+    const classNames = options
+      .map((option) => option.value)
+      .filter((className) => className !== '');
+
+    return new RegExp(`${classPrefix}-(${classNames.join('|')})`, 'gi');
+  };
+
+  prepareClassName = (className, classNames) => {
+    return className.replace(classNames, '').trim().replace('/[ ]{2,}/g', ' ');
+  };
+
+  generateIconsChoices = () => {
+    const icons = chiselEditorScripts?.icons || null;
+
+    if (!icons) {
+      return [];
+    }
+
+    const choices = [];
+
+    Object.entries(icons).forEach(([value, label]) => {
+      choices.push({
+        label,
+        value,
+      });
+    });
+
+    return choices;
+  };
+}
+
+export default new Utils();

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/editor.js

@@ -1,2 +1,3 @@
 import './editor/blocks-styles';
 import './editor/blocks';
+import './editor/blocks-mods';

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/login.js

@@ -13,13 +13,22 @@ class LoginPage {
     };
 
     this.logo = this.loginPage.querySelector('#login h1 a');
+    this.logoData = chiselScripts?.logoData;
 
-    this.setLogoImage();
+    if (this.logoData) {
+      this.setLogoImage();
+    }
   }
 
   setLogoImage() {
     if (this.logo) {
-      this.logo.setAttribute('style', `background-image: url("${chiselScripts.logoUrl}");`);
+      const logoWidth = this.logoData[1] > 300 ? 300 : this.logoData[1];
+      const logoHeight = this.logoData[2] > 100 ? 100 : this.logoData[2];
+
+      this.logo.setAttribute(
+        'style',
+        `background-image: url("${this.logoData[0]}");width: ${logoWidth}px;height: ${logoHeight}px;`,
+      );
       this.logo.setAttribute('aria-hidden', 'true');
       this.logo.parentElement.classList.add(this.classnames.loaded);
     }

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/blocks/_core-button.scss

@@ -1,13 +1,25 @@
 @use '~design' as *;
+@use '../../design/settings';
+
+$_buttons-icons: settings.$buttons-icons;
 
 .wp-block-button {
   .wp-block-button__link {
     @include button;
+
+    &.has-text-align-center {
+      justify-content: center;
+    }
+
+    &:disabled {
+      @include button-disabled;
+    }
   }
 
   .wp-block-button__link,
   &.is-style-primary .wp-block-button__link {
     @include button-primary;
+    @include button-primary-icon;
 
     &:hover,
     &:focus {
@@ -17,10 +29,12 @@
 
   &.is-style-primary-outline .wp-block-button__link {
     @include button-primary-outline;
+    @include button-primary-outline-icon;
 
     &:hover,
     &:focus {
       @include button-primary-outline-hover;
+      @include button-primary-outline-icon-hover;
     }
   }
 
@@ -35,10 +49,12 @@
 
   &.is-style-secondary-outline .wp-block-button__link {
     @include button-secondary-outline;
+    @include button-secondary-outline-icon;
 
     &:hover,
     &:focus {
       @include button-secondary-outline-hover;
+      @include button-secondary-outline-icon-hover;
     }
   }
 
@@ -53,10 +69,41 @@
 
   &.is-style-tertiary-outline .wp-block-button__link {
     @include button-tertiary-outline;
+    @include button-tertiary-outline-icon;
 
     &:hover,
     &:focus {
       @include button-tertiary-outline-hover;
+      @include button-tertiary-outline-icon-hover;
+    }
+  }
+
+  &.is-size-small .wp-block-button__link {
+    @include button-small;
+  }
+
+  &.is-size-large .wp-block-button__link {
+    @include button-large;
+  }
+
+  &.has-icon {
+    @include button-icon;
+
+    .wp-block-button__link {
+      &::after {
+        width: px-rem(24);
+        height: px-rem(24);
+        margin-left: px-rem(8);
+        content: '';
+      }
+    }
+  }
+
+  @each $button-icon in $_buttons-icons {
+    &.has-icon-#{$button-icon} .wp-block-button__link {
+      &::after {
+        @include get-icon($button-icon);
+      }
     }
   }
 }

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/blocks/_core.scss

@@ -64,3 +64,7 @@
     border-radius: get-border-radius('normal');
   }
 }
+
+.has-text-align-center {
+  text-align: center;
+}

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/components/_buttons.scss

@@ -1,4 +1,7 @@
 @use '~design' as *;
+@use '../../design/settings';
+
+$_buttons-icons: settings.$buttons-icons;
 
 .c-btn {
   @include button;
@@ -6,10 +9,15 @@
   &.is-loading {
     @include button-loading;
   }
+
+  &:disabled {
+    @include button-disabled;
+  }
 }
 
 .c-btn--primary {
   @include button-primary;
+  @include button-primary-icon;
 }
 
 .c-btn--primary:hover,
@@ -19,11 +27,13 @@
 
 .c-btn--primary-outline {
   @include button-primary-outline;
+  @include button-primary-outline-icon;
 }
 
 .c-btn--primary-outline:hover,
 .c-btn--primary-outline:focus {
   @include button-primary-outline-hover;
+  @include button-primary-outline-icon-hover;
 }
 
 .c-btn--secondary {
@@ -37,11 +47,13 @@
 
 .c-btn--secondary-outline {
   @include button-secondary-outline;
+  @include button-secondary-outline-icon;
 }
 
 .c-btn--secondary-outline:hover,
 .c-btn--secondary-outline:focus {
   @include button-secondary-outline-hover;
+  @include button-secondary-outline-icon-hover;
 }
 
 .c-btn--tertiary {
@@ -55,13 +67,38 @@
 
 .c-btn--tertiary-outline {
   @include button-tertiary-outline;
+  @include button-tertiary-outline-icon;
 }
 
 .c-btn--tertiary-outline:hover,
 .c-btn--tertiary-outline:focus {
   @include button-tertiary-outline-hover;
+  @include button-tertiary-outline-icon-hover;
 }
 
 .c-btn--small {
   @include button-small;
 }
+
+.c-btn--large {
+  @include button-large;
+}
+
+.c-btn.has-icon {
+  @include button-icon;
+
+  &::after {
+    width: px-rem(24);
+    height: px-rem(24);
+    margin-left: px-rem(8);
+    content: '';
+  }
+}
+
+@each $button-icon in $_buttons-icons {
+  .c-btn.has-icon-#{$button-icon} {
+    &::after {
+      @include get-icon($button-icon);
+    }
+  }
+}

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/components/_main-nav.scss

@@ -231,7 +231,7 @@
 
 @include bp(large) {
   .c-main-nav--columns {
-    .c-main-nav__item {
+    .c-main-nav__item:not(.is-default) {
       position: static;
     }
 
@@ -247,7 +247,7 @@
       }
     }
 
-    .c-main-nav__subitems {
+    .c-main-nav__item:not(.is-default) .c-main-nav__subitems {
       &.is-level-2 {
         top: calc(100% - px-rem(16));
         right: 0;

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/elements/_form.scss

@@ -32,7 +32,8 @@ $form-checkbox-radio-height: px-rem(18);
 $form-label-margin: get-margin('little');
 $form-select-arrow: url('data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2212%22%20height%3D%2212%22%20viewBox%3D%220%200%2012%2012%22%3E%3Ctitle%3Edown-arrow%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000000%22%3E%3Cpath%20d%3D%22M10.293%2C3.293%2C6%2C7.586%2C1.707%2C3.293A1%2C1%2C0%2C0%2C0%2C.293%2C4.707l5%2C5a1%2C1%2C0%2C0%2C0%2C1.414%2C0l5-5a1%2C1%2C0%2C1%2C0-1.414-1.414Z%22%20fill%3D%22%23000000%22%3E%3C%2Fpath%3E%3C%2Fg%3E%3C%2Fsvg%3E');
 
-/* All elements regardless of types */
+/* Some rules have an important declaration to overwrite gravity forms rules */
+
 input,
 select,
 option,
@@ -71,9 +72,6 @@ input::file-selector-button {
   }
 }
 
-/* All elements with types */
-
-/* Select and text-fields */
 select,
 .select2-container .select2-selection--single,
 textarea,
@@ -89,11 +87,11 @@ input[type='text'],
 input[type='time'],
 input[type='url'],
 input[type='week'] {
-  width: 100%;
+  width: 100% !important;
   max-width: 100%;
-  padding: $form-field-padding;
+  padding: $form-field-padding !important;
   margin: 0 0 $form-field-margin;
-  font-size: $form-field-font-size;
+  font-size: $form-field-font-size !important;
   line-height: $form-field-line-height;
   color: $form-field-color;
   background-color: $form-field-bg-color;

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/login.scss

@@ -138,15 +138,20 @@ body.login {
     a {
       display: block;
       min-width: px-rem(84);
-      max-width: 100%;
+      max-width: px-rem(200);
+      height: auto;
       max-height: px-rem(100);
       margin: 0;
       background-repeat: no-repeat;
       background-position: center;
       background-size: contain;
 
+      @include bp(360px) {
+        max-width: 100%;
+      }
+
       @include bp(medium) {
-        max-width: px-rem(400);
+        max-width: px-rem(300);
       }
     }
 

package/lib/commands/create/creators/app/chisel-starter-theme/theme.json

@@ -78,10 +78,7 @@
       ],
       "duotone": [
         {
-          "colors": [
-            "#2a1468",
-            "#ff6d54"
-          ],
+          "colors": ["#2a1468", "#ff6d54"],
           "slug": "primary-secondary",
           "name": "Primary & Secondary"
         }
@@ -185,7 +182,7 @@
               "fontStyle": "normal",
               "fontStretch": "normal",
               "fontDisplay": "swap",
-              "src": [ "file:./fonts/quicksand-regular.woff2" ]
+              "src": ["file:./assets/fonts/quicksand-regular.woff2"]
             },
             {
               "fontFamily": "Quicksand",
@@ -193,7 +190,7 @@
               "fontStyle": "normal",
               "fontStretch": "normal",
               "fontDisplay": "swap",
-              "src": [ "file:./fonts/quicksand-700.woff2" ]
+              "src": ["file:./assets/fonts/quicksand-700.woff2"]
             }
           ]
         }
@@ -206,21 +203,14 @@
       "width": false
     },
     "layout": {
-        "contentSize": "1200px",
-        "wideSize": "1440px"
+      "contentSize": "1200px",
+      "wideSize": "1440px"
     },
     "spacing": {
       "blockGap": false,
       "margin": false,
       "padding": false,
-      "units": [
-        "%",
-        "px",
-        "em",
-        "rem",
-        "vh",
-        "vw"
-      ],
+      "units": ["%", "px", "em", "rem", "vh", "vw"],
       "defaultSpacingSizes": false,
       "spacingScale": {
         "operator": "+",

package/lib/commands/create/creators/app/chisel-starter-theme/twig_cs.php

@@ -3,10 +3,14 @@ declare(strict_types=1);
 
 use FriendsOfTwig\Twigcs;
 
-$finder = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/views' );
+$finder_1 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/views' );
+$finder_2 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/build/blocks' );
+$finder_3 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/build/blocks-acf' );
 
 return Twigcs\Config\Config::create()
-	->addFinder( $finder )
+	->addFinder( $finder_1 )
+	->addFinder( $finder_2 )
+	->addFinder( $finder_3 )
 	->setName( 'chisel' )
 	->setSeverity( 'warning' )
 	->setDisplay( Twigcs\Config\ConfigInterface::DISPLAY_BLOCKING )

package/lib/commands/create/creators/app/chisel-starter-theme/views/404.twig

@@ -1,7 +1,7 @@
 {% extends "single.twig" %}
 
 {% block inner_content %}
-  <h1>{{ __( '404 - Not found', 'chisel' ) }}</h1>
-  <h2>{{ __( 'Sorry, we couldn\'t find what you\'re looking for', 'chisel' ) }}</h2>
+  <h1>{{ __('404 - Not found', 'chisel') }}</h1>
+  <h2>{{ __('Sorry, we couldn\'t find what you\'re looking for', 'chisel') }}</h2>
 {% endblock %}
 

package/lib/commands/create/creators/app/chisel-starter-theme/views/components/icon.twig

@@ -0,0 +1 @@
+<i class="c-icon c-icon--{{ icon }}"></i>

package/lib/commands/create/creators/app/chisel-starter-theme/views/components/slider.twig

@@ -6,7 +6,7 @@
     <!-- Additional required wrapper -->
     <div class="swiper-wrapper c-slider__slides">
       <!-- Slides html. Each slide must have a 'swiper-slide' class -->
-      {{ slidesHtml }}
+      {{ slides_html }}
     </div>
   </div>
 </div>

package/lib/commands/create/creators/app/chisel-starter-theme/views/index.twig

@@ -17,7 +17,7 @@
               {% include "components/post-item.twig" with {post: post} %}
             {% endfor %}
           {% else %}
-            dupa
+            <h2>{{ __('No results found', 'chisel') }}</h2>
           {% endif %}
         </div>
 

package/lib/commands/create/creators/wp-plugins/plugins.json

@@ -1,8 +1,6 @@
 {
   "plugins": {
-    "Classic Editor": "classic-editor",
     "WP Premium: Gravity Forms": "https://github.com/wp-premium/gravityforms/archive/master.zip",
-    "WP Sync DB": "https://github.com/wp-sync-db/wp-sync-db/archive/master.zip",
-    "WP Sync DB Media File Addon": "https://github.com/wp-sync-db/wp-sync-db-media-files/archive/master.zip"
+    "WP Migrate Lite": "wp-migrate-db"
   }
 }

package/lib/commands/create/packages-versions.js

@@ -1,5 +1,5 @@
 module.exports = {
   'chisel-scripts': '2.0.0-alpha.1',
   'chisel-shared-utils': '2.0.0-alpha.0',
-  'generator-chisel': '2.0.0-alpha.3',
+  'generator-chisel': '2.0.0-alpha.5',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-chisel",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.5",
   "description": "A generator for scaffolding front-end and WordPress projects",
   "bin": {
     "chisel": "bin/chisel.js"
@@ -37,5 +37,5 @@
     "tinyqueue": "^2.0.3",
     "update-notifier": "^4.1.0"
   },
-  "gitHead": "135a429a7af5deaae61c03de28371129ae21a34c"
+  "gitHead": "f8767b71f2178288d9e37e3a44491b054e2a08ca"
 }

package/lib/commands/create/creators/app/chisel-starter-theme/lint-staged.config.mjs

@@ -1,8 +0,0 @@
-const listStagedConfig = {
-  '*.{cjs,mjs,js,jsx,ts,tsx}': ['eslint --fix'],
-  '*.vue': ['stylelint --fix', 'eslint --fix --allow-empty-input'],
-  '*.{json,md,yml}': ['prettier --write'],
-  '*.{css,scss}': ['stylelint --fix --allow-empty-input'],
-};
-
-export default listStagedConfig;