@kitconcept/volto-light-theme 8.0.0-alpha.28 → 8.0.0-alpha.29

package/src/theme/blocks/_image.scss

@@ -4,145 +4,80 @@ figure {
   margin: 0;
 }
 
-.block.image.has--block-width--full figcaption {
-  padding-right: 25px;
-  padding-left: 25px;
-}
-
-.block.image {
+.block.image,
+.block-editor-image {
+  --align-left: left;
+  --align-center: none;
+  --align-right: right;
   margin: 0;
+  margin-top: $spacing-large;
 
-  &.align.left,
-  &.align.right {
-    // This is to equal the heading margin in case of the
-    // floating image + heading use case
-    // It matches the mocks for standalone images anyways
-    margin-top: $spacing-large;
-    margin-bottom: 0 !important;
+  &.has--block-width--full {
+    figcaption {
+      padding-right: 25px;
+      padding-left: 25px;
+    }
   }
 
   &.has--block-width--default,
+  &.has--block-width--layout,
   &.has--block-width--narrow,
   &.has--block-width--full {
-    figure:not(.left, .right) {
+    figure {
       margin-top: $spacing-large;
       margin-bottom: $spacing-large;
     }
   }
 
-  figure {
-    img {
-      width: 100% !important;
-      height: auto;
-      aspect-ratio: var(--image-aspect-ratio, auto);
-    }
-
-    &.right {
-      margin-bottom: 20px;
-      margin-left: 20px;
-      float: right;
-
+  &.has--block-alignment--left,
+  &.has--block-alignment--right {
+    margin-bottom: 0 !important;
+    figure {
+      margin-top: 0 !important;
+      margin-bottom: $spacing-small;
       @container (max-width: #{$largest-mobile-screen}) {
+        max-width: unset !important;
         margin-bottom: $spacing-large;
       }
 
       img {
-        margin-right: 0 !important;
-        margin-bottom: 0px;
-        margin-left: 0 !important;
+        margin: 0 !important;
         float: none;
       }
     }
-
-    &.left {
-      margin-right: 20px;
-      margin-bottom: 20px;
-      float: left;
-
-      @container (max-width: #{$largest-mobile-screen}) {
-        margin-bottom: $spacing-large;
-      }
-
-      img {
-        margin-right: 0 !important;
-        margin-bottom: 0px;
-        float: none;
+    &.small {
+      figure {
+        max-width: 220px;
       }
     }
 
-    &.left,
-    &.right {
-      &.large {
-        width: 50%;
-        height: auto;
-
-        @media only screen and (max-width: 768px) {
-          width: 100%;
-        }
-      }
-
-      &.medium {
-        width: 50%;
-        height: auto;
-        @media only screen and (max-width: 768px) {
-          width: 100%;
-        }
-      }
-
-      &.small {
-        width: 25%;
-        height: auto;
-        @media only screen and (max-width: 768px) {
-          width: 100%;
-        }
+    &.medium {
+      figure {
+        max-width: 300px;
       }
     }
+  }
 
-    &.wide,
-    &.full {
-      margin-top: $spacing-large;
-      margin-bottom: $spacing-large;
+  &.has--block-alignment--left {
+    figure {
+      @include floated-figure('left');
     }
+  }
 
-    &.center {
-      width: 100% !important;
-      margin-right: auto !important;
-      margin-bottom: $spacing-large;
-      margin-left: auto !important;
-      object-fit: cover;
-
-      img {
-        height: auto;
-        margin-right: initial;
-        margin-left: initial;
-      }
-
-      &.large,
-      &.medium,
-      &.small {
-        width: 100% !important;
-      }
-
-      &.large {
-        figcaption {
-          text-align: start;
-        }
-      }
-
-      &.medium {
-        figcaption {
-          width: 100%;
-          margin-right: auto;
-          margin-left: auto;
-          text-align: start;
-        }
-      }
+  &.has--block-alignment--right {
+    figure {
+      @include floated-figure('right');
     }
   }
 
-  img {
-    max-width: 100% !important;
-    height: auto;
+  figure {
+    width: 100%;
+    img {
+      width: 100% !important;
+      max-width: 100% !important;
+      height: auto;
+      aspect-ratio: var(--image-aspect-ratio, auto);
+    }
   }
 }
 
@@ -181,72 +116,36 @@ figcaption {
 
 // video block
 
-#page-document .block.video.align.left,
-.block.video.align.left,
-#page-document .block.video.align.right,
-.block.video.align.right {
-  @include default-container-width;
-}
-
-#page-document .block.video.align.center figure,
-.block.video.align.center figure {
-  @include default-container-width;
-}
-
-.block.video {
-  .figure {
-    width: 100%;
-  }
-
-  &.full figcaption {
-    padding-right: 25px;
-    padding-left: 25px;
-  }
-
-  &.wide,
-  &.full,
-  &.center {
-    margin-top: $spacing-large;
-    margin-bottom: $spacing-large;
-  }
-
-  &.align.left.has--backgroundColor--grey figure,
-  &.align.right.has--backgroundColor--grey figure {
-    padding-top: 25px;
-  }
+.block.video,
+.block-editor-video {
+  margin-top: $spacing-large;
+  .video-inner {
+    @include variable-container-width();
 
-  &.align.left.has--backgroundColor--grey,
-  &.align.right.has--backgroundColor--grey {
-    margin-top: 0px;
-    margin-bottom: 0px;
+    .placeholder {
+      width: 100% !important;
+    }
   }
-
-  &.align.left,
-  &.align.right {
-    margin-top: $spacing-large;
-    margin-bottom: 0 !important;
-
+  &.has--block-alignment--left {
     .video-inner {
-      margin-bottom: 20px !important;
-      @media only screen and (max-width: $tablet-breakpoint) {
-        width: 100%;
-      }
-      @container (max-width: #{$largest-mobile-screen}) {
-        margin-bottom: $spacing-large !important;
-      }
+      width: 100%;
+      @include floated-figure('left');
     }
+  }
 
-    img {
-      margin: 0 !important;
+  &.has--block-alignment--right {
+    .video-inner {
+      width: 100%;
+      @include floated-figure('right');
     }
   }
-
-  &.align.left .video-inner {
-    margin-right: 20px !important;
+  figure {
+    width: 100%;
   }
 
-  &.align.right .video-inner {
-    margin-left: 20px !important;
+  &.has--block-width--full figcaption {
+    padding-right: 25px;
+    padding-left: 25px;
   }
 }
 
@@ -371,35 +270,46 @@ figcaption {
   }
 }
 
-// Image block overrides
-#page-edit,
-#page-add {
-  .block-editor-image figure.center {
-    @include variable-container-width();
-  }
-
-  .block-editor-image.default figure {
-    max-width: var(--default-container-width);
-  }
-}
-
-#page-document .blocks-group-wrapper > .block.image.align.center {
-  @include variable-container-width();
-}
-#page-document .blocks-group-wrapper > .block.image.align.center figure {
+#page-document .blocks-group-wrapper > .block.image,
+#page-document .blocks-group-wrapper > .block.video {
   @include variable-container-width();
 }
 
 #page-document .blocks-group-wrapper {
-  & > .block.image.align.center.has--block-width--default {
-    // Unfortunately needed to have more specificity than the top one
-    // TODO: Remove when using layers and the BMv3
+  // Unfortunately needed to have more specificity than the top one
+  // TODO: Remove when using layers and the BMv3
+  & > .block.image.has--block-width--default,
+  & > .block.video.has--block-width--default {
     @include adjustMarginsToContainer($default-container-width);
   }
-  & > .block.image.align.center.has--block-width--layout {
+  & > .block.image.has--block-width--layout,
+  & > .block.video.has--block-width--layout {
     @include adjustMarginsToContainer($layout-container-width);
   }
-  & > .block.image.align.center.has--block-width--narrow {
+  & > .block.image.has--block-width--narrow,
+  & > .block.video.has--block-width--narrow {
     @include adjustMarginsToContainer($narrow-container-width);
   }
 }
+
+// Edit block overrides
+#page-edit,
+#page-add {
+  .block-editor-image,
+  .block-editor-video {
+    &.has--block-alignment--right,
+    &.has--block-alignment--left {
+      .block .block:not(.inner)::before {
+        z-index: 1;
+      }
+    }
+    .block.inner .block .block {
+      z-index: 2;
+      @include variable-container-width();
+
+      &:before {
+        display: none;
+      }
+    }
+  }
+}

package/src/theme/blocks/_listing.scss

@@ -43,6 +43,9 @@
   &.next--is--__button {
     .items > .listing-item:last-child {
       border-bottom: 1px solid var(--theme-font-color, black);
+      .card-inner {
+        padding-bottom: $spacing-medium;
+      }
     }
   }
   &.next--is--__button {
@@ -54,7 +57,7 @@
 
   .listing-item {
     border-bottom: 1px solid $black;
-    margin-bottom: 40px;
+    margin-bottom: $spacing-medium;
     .card-summary {
       padding: 0;
 
@@ -165,6 +168,7 @@
       .card {
         flex-grow: 1;
         .card-inner {
+          padding-bottom: $spacing-medium !important;
           .image-wrapper {
             img {
               margin: 0;

package/src/theme/blocks/_maps.scss

@@ -1,50 +1,76 @@
-.block.maps {
-  iframe {
-    height: unset;
-    aspect-ratio: var(--image-aspect-ratio, $aspect-ratio);
-  }
-  &.align.left {
+.block.maps,
+.block-editor-maps {
+  margin-top: $spacing-large;
+  margin-bottom: $spacing-large;
+  .maps-inner {
+    @include variable-container-width();
+
     iframe {
       height: unset;
-      margin-right: 20px !important;
-      margin-bottom: 20px !important;
       aspect-ratio: var(--image-aspect-ratio, $aspect-ratio);
-      @container (max-width: #{$largest-mobile-screen}) {
-        margin-bottom: $spacing-large !important;
-      }
     }
-    margin-top: $spacing-large;
-    margin-bottom: 0 !important;
   }
-  &.align.right {
-    iframe {
-      height: unset;
-      margin-bottom: 20px !important;
-      margin-left: 20px !important;
-      aspect-ratio: var(--image-aspect-ratio, $aspect-ratio);
-      @container (max-width: #{$largest-mobile-screen}) {
-        margin-bottom: $spacing-large !important;
-      }
+  &.has--block-alignment--left {
+    .maps-inner {
+      width: 100%;
+      @include floated-figure('left');
     }
-    margin-top: $spacing-large;
-    margin-bottom: 0 !important;
   }
 
-  &.wide,
-  &.full,
-  &.center {
-    margin-top: $spacing-large;
-    margin-bottom: $spacing-large;
+  &.has--block-alignment--right {
+    .maps-inner {
+      width: 100%;
+      @include floated-figure('right');
+    }
+  }
+  &.has--block-alignment--left,
+  &.has--block-alignment--right {
+    margin-bottom: 0 !important;
+    @container (max-width: #{$largest-mobile-screen}) {
+      margin-bottom: $spacing-large !important;
+    }
   }
 
-  &.align.full iframe {
+  &.has--block-width--full iframe {
     max-height: 600px;
   }
+}
 
-  &.align.right iframe,
-  &.align.left iframe {
-    @container (max-width: #{$largest-mobile-screen}) {
-      margin-bottom: $spacing-large !important;
+#page-document .blocks-group-wrapper > .block.maps {
+  @include variable-container-width();
+}
+
+#page-document .blocks-group-wrapper {
+  // Unfortunately needed to have more specificity than the top one
+  // TODO: Remove when using layers and the BMv3
+  & > .block.maps.has--block-width--default {
+    @include adjustMarginsToContainer($default-container-width);
+  }
+  & > .block.maps.has--block-width--layout {
+    @include adjustMarginsToContainer($layout-container-width);
+  }
+  & > .block.maps.has--block-width--narrow {
+    @include adjustMarginsToContainer($narrow-container-width);
+  }
+}
+
+// Edit block overrides
+#page-edit,
+#page-add {
+  .block-editor-maps {
+    &.has--block-alignment--right,
+    &.has--block-alignment--left {
+      .block .block:not(.inner)::before {
+        z-index: 1;
+      }
+    }
+    .block.inner .block .block {
+      z-index: 2;
+      @include variable-container-width();
+
+      &:before {
+        display: none;
+      }
     }
   }
 }

package/src/transforms/to6.ts

@@ -1,9 +1,6 @@
 import type { BlocksFormData } from '@plone/types';
-import { findStyleByName } from '@plone/volto/helpers/Blocks/Blocks';
 
-import config from '@plone/volto/registry';
-
-function* visitBlocks(blocks) {
+function* visitBlocks(blocks: any): Generator<any> {
   for (const key in blocks) {
     if (blocks.hasOwnProperty(key)) {
       const block = blocks[key];
@@ -16,17 +13,6 @@ function* visitBlocks(blocks) {
 }
 
 export function migrateToVLT6ColorAndWidthModel(data: BlocksFormData) {
-  const NORMALIZED_WIDTHS = [
-    ...config.blocks.widths,
-    {
-      style: {
-        '--block-width': 'var(--default-container-width)',
-      },
-      name: 'wide',
-      label: 'Default',
-    },
-  ];
-
   for (const block of visitBlocks(data.blocks)) {
     if (block?.styles?.backgroundColor) {
       if (block.styles.backgroundColor === 'transparent') {
@@ -41,10 +27,7 @@ export function migrateToVLT6ColorAndWidthModel(data: BlocksFormData) {
         ...block.styles,
         'blockWidth:noprefix':
           block.styles?.['blockWidth:noprefix'] ??
-          findStyleByName(
-            NORMALIZED_WIDTHS,
-            `${block.styles?.buttonAlign === 'wide' ? 'default' : 'narrow'}`,
-          ),
+          (block.styles?.buttonAlign === 'wide' ? 'default' : 'narrow'),
       };
 
       delete block.styles.buttonAlign;
@@ -54,41 +37,14 @@ export function migrateToVLT6ColorAndWidthModel(data: BlocksFormData) {
       block.styles = {
         ...block.styles,
         shortLine:
-          block.styles?.['shortLine'] ?? block?.styles?.align === 'left'
-            ? true
-            : false,
-        'align:noprefix': block.styles?.['align:noprefix'] ?? {
-          '--block-alignment': 'var(--align-left)',
-        },
+          block.styles?.['shortLine'] ?? block?.styles?.align === 'left',
+        'align:noprefix': block.styles?.['align:noprefix'] ?? 'left',
         'blockWidth:noprefix':
           block.styles?.['blockWidth:noprefix'] ??
-          findStyleByName(
-            NORMALIZED_WIDTHS,
-            `${block.styles?.align === 'full' ? 'default' : 'narrow'}`,
-          ),
+          (block.styles?.align === 'full' ? 'default' : 'narrow'),
       };
 
       delete block.styles.align;
     }
-
-    if (
-      block['@type'] === 'image' &&
-      !['left', 'right'].includes(block?.align)
-    ) {
-      block.styles = {
-        ...block.styles,
-        'blockWidth:noprefix':
-          block.styles?.['blockWidth:noprefix'] ??
-          findStyleByName(
-            NORMALIZED_WIDTHS,
-            block?.align === 'wide'
-              ? 'default'
-              : block?.align === 'center'
-                ? 'narrow'
-                : block.align,
-          ),
-      };
-      block.align = 'center';
-    }
   }
 }