@kitconcept/volto-light-theme 1.0.0 → 1.0.1

package/.github/workflows/acceptance.yml

@@ -4,7 +4,7 @@ on: [push]
 env:
   ADDON_NAME: "@kitconcept/volto-light-theme"
   ADDON_PATH: "volto-light-theme"
-  VOLTO_VERSION: "17.0.0-alpha.30"
+  VOLTO_VERSION: "17.2.0"
 
 jobs:
 

package/.github/workflows/deploy.yml

@@ -11,7 +11,7 @@ on:
 env:
   ENVIRONMENT: "light-theme.kitconcept.io"
   IMAGE_NAME: "ghcr.io/kitconcept/voltolighttheme-frontend"
-  VOLTO_VERSION: "17.0.0-alpha.30"
+  VOLTO_VERSION: "17.2.0"
 
 jobs:
   meta:

package/CHANGELOG.md

@@ -8,6 +8,18 @@
 
 <!-- towncrier release notes start -->
 
+## 1.0.1 (2023-10-18)
+
+### Bugfix
+
+- Small CSS adjustments @sneridagh [#249](https://github.com/kitconcept/volto-light-theme/pull/249)
+
+### Internal
+
+- Update to Volto 17 final @sneridagh [#246](https://github.com/kitconcept/volto-light-theme/pull/246)
+- Bump Volto version @sneridagh [#249](https://github.com/kitconcept/volto-light-theme/pull/249)
+
+
 ## 1.0.0 (2023-09-29)
 
 ### Feature

package/Makefile

@@ -22,7 +22,7 @@ RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
 PLONE_VERSION=6.0.6
-VOLTO_VERSION=17.0.0-alpha.30
+VOLTO_VERSION=17.2.0
 
 ADDON_NAME='@kitconcept/volto-light-theme'
 ADDON_PATH='volto-light-theme'

package/README.md

@@ -125,6 +125,7 @@ It is recommended that your project or policy add-on `package.json` include the
     "@kitconcept/volto-introduction-block": "1.0.0",
     "@kitconcept/volto-light-theme": "1.0.0",
     "@kitconcept/volto-separator-block": "4.0.0",
+    "@kitconcept/volto-highlight-block": "3.0.0",
   }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitconcept/volto-light-theme",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Volto Light Theme by kitconcept",
   "main": "src/index.js",
   "repository": {
@@ -72,6 +72,6 @@
     "@kitconcept/volto-introduction-block": "^1.0.0",
     "@kitconcept/volto-separator-block": "^4.0.0",
     "@kitconcept/volto-slider-block": "^5.1.1",
-    "@plone/volto": "^17.0.0-alpha.30"
+    "@plone/volto": "^17.2.0"
   }
 }

package/src/components/Blocks/schema.js

@@ -36,3 +36,8 @@ export const defaultStylingSchema = ({ schema, formData, intl }) => {
 
   return schema;
 };
+
+export const removeStylingSchema = ({ schema, formData, intl }) => {
+  schema.fieldsets = schema.fieldsets.filter((item) => item.id !== 'styling');
+  return schema;
+};

package/src/index.js

@@ -1,7 +1,10 @@
 import { defineMessages } from 'react-intl';
 
 import { composeSchema, getPreviousNextBlock } from '@plone/volto/helpers';
-import { defaultStylingSchema } from './components/Blocks/schema';
+import {
+  defaultStylingSchema,
+  removeStylingSchema,
+} from './components/Blocks/schema';
 import { teaserSchemaEnhancer } from './components/Blocks/Teaser/schema';
 import { videoBlockSchemaEnhancer } from './components/Blocks/Video/schema';
 import { gridTeaserDisableStylingSchema } from '@plone/volto/components/manage/Blocks/Teaser/schema';
@@ -184,43 +187,43 @@ const applyConfig = (config) => {
     colors: BG_COLORS,
     schemaEnhancer: defaultStylingSchema,
     icon: gridSVG,
-    gridAllowedBlocks: ['teaser', 'image', 'slate'],
-    // One could customize the blocks inside the grid like this:
-    blocksConfig: {
-      ...config.blocks.blocksConfig,
-      slate: {
-        ...config.blocks.blocksConfig.slate,
-        // Slate in grids must have an extra wrapper with the `slate` className
-        view: (props) => {
-          const EnhancedSlateViewComponent =
-            config.blocks.blocksConfig.slate.view;
-          return (
-            <div className="slate">
-              <EnhancedSlateViewComponent {...props} />
-            </div>
-          );
-        },
-      },
-      image: {
-        ...config.blocks.blocksConfig.image,
-        schemaEnhancer: composeSchema(
-          imageBlockSchemaEnhancer,
-          gridImageDisableSizeAndPositionHandlersSchema,
-        ),
-      },
-      teaser: {
-        ...config.blocks.blocksConfig.teaser,
-        schemaEnhancer: composeSchema(
-          gridTeaserDisableStylingSchema,
-          teaserSchemaEnhancer,
-        ),
-      },
-      listing: {
-        ...config.blocks.blocksConfig.listing,
-        allowed_headline_tags: [['h2', 'h2']],
-        variations: config.blocks.blocksConfig.listing.variations,
+  };
+
+  config.blocks.blocksConfig.gridBlock.blocksConfig = {
+    ...config.blocks.blocksConfig,
+    slate: {
+      ...config.blocks.blocksConfig.slate,
+      // Slate in grids must have an extra wrapper with the `slate` className
+      view: (props) => {
+        const EnhancedSlateViewComponent =
+          config.blocks.blocksConfig.slate.view;
+        return (
+          <div className="slate">
+            <EnhancedSlateViewComponent {...props} />
+          </div>
+        );
       },
     },
+    image: {
+      ...config.blocks.blocksConfig.image,
+      schemaEnhancer: composeSchema(
+        imageBlockSchemaEnhancer,
+        gridImageDisableSizeAndPositionHandlersSchema,
+      ),
+    },
+    teaser: {
+      ...config.blocks.blocksConfig.teaser,
+      schemaEnhancer: composeSchema(
+        gridTeaserDisableStylingSchema,
+        teaserSchemaEnhancer,
+      ),
+    },
+    listing: {
+      ...config.blocks.blocksConfig.listing,
+      allowed_headline_tags: [['h2', 'h2']],
+      schemaEnhancer: removeStylingSchema,
+      variations: [],
+    },
   };
 
   config.blocks.blocksConfig.introduction = {

package/src/theme/_bgcolor-blocks-layout.scss

@@ -50,3 +50,8 @@
     margin-bottom: 0;
   }
 }
+
+// Edit mode adjustments
+.block-editor-gridBlock.has--backgroundColor--grey .block h2.headline {
+  padding-top: $spacing-xlarge;
+}