@doodl/slate 1.23.0 → 1.23.2

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
+
+### [1.23.2](https://bitbucket.org/doodlltd/slate/compare/v1.23.1...v1.23.2) (2024-07-19)
+
+### [1.23.1](https://bitbucket.org/doodlltd/slate/compare/v1.23.0...v1.23.1) (2024-01-12)
+
+
+### Bug Fixes
+
+* resolve string interpolation error causing MediaQueryPlugin error ([87ddf11](https://bitbucket.org/doodlltd/slate/commit/87ddf11faf60bb7aa949f5413ad8123d944454de))
 
 ## [1.23.0](https://bitbucket.org/doodlltd/slate/compare/v1.22.16...v1.23.0) (2023-09-17)
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@doodl/slate",
-    "version": "1.23.0",
+    "version": "1.23.2",
     "description": "",
     "main": "./js/dist/index.js",
     "module": "./js/dist/index.js",
@@ -11,7 +11,7 @@
     "scripts": {
         "build": "babel js/src --out-dir js/dist",
         "start": "babel js/src --watch --out-dir js/dist",
-        "release": "standard-version -a",
+        "release": "commit-and-tag-version -a",
         "prepublishOnly": "rm -rf js/dist && npm run build",
         "format": "prettier --write .",
         "lint": "eslint . && stylelint --maxWarnings 0 scss",
@@ -29,9 +29,9 @@
     "devDependencies": {
         "@babel/cli": "^7.10.4",
         "@babel/preset-react": "^7.16.5",
-        "@doodl/common-js-config": "^1.7.0",
-        "@doodl/eslint-config": "npm:@doodl/common-js-config@^1.7.0",
-        "standard-version": "^9.1.1"
+        "@doodl/common-js-config": "^1.8.1",
+        "@doodl/eslint-config": "npm:@doodl/common-js-config@^1.8.1",
+        "commit-and-tag-version": "^9.6.0"
     },
     "dependencies": {
         "classnames": "^2.3.1",

package/scss/_mixins.scss

@@ -5,7 +5,7 @@
 // Generate preset media query from breakpoint key
 @function media-query-from-breakpoint($breakpoint, $media: 'screen') {
     $width: map-get($slate-breakpoints, $breakpoint);
-    @return '#{$media} and (min-width: #{$width})';
+    @return #{$media} and (min-width: #{$width});
 }
 
 // Output content inside a media query for the defined breakpoint,

package/scss/silverstripe/_editor.scss

@@ -1,3 +1,11 @@
+/**
+ *
+ * Defines styles for content generated by the SilverStripe TinyMCE editor in
+ * HTMLText field outputs.
+ *
+ */
+
+
 @import '../mixins';
 @import '../variables/silverstripe-editor';
 
@@ -62,8 +70,6 @@
     .captionImage,
     .embed {
         display: block;
-        padding: $slate-silverstripe-editor-caption-padding;
-        background-color: $slate-silverstripe-editor-caption-image-background-colour;
         .image,
         iframe {
             @include align-all {
@@ -75,8 +81,31 @@
             padding: 0;
         }
         .caption {
-            padding: 0 $slate-default-spacing/2;
-            color: $slate-muted;
+            padding: $slate-silverstripe-editor--caption-padding;
+            color: $slate-silverstripe-editor--caption-color;
+            @if $slate-silverstripe-editor--caption-font-size != 0 {
+                font-size: $slate-silverstripe-editor--caption-font-size;
+            }
+            @if $slate-silverstripe-editor--caption-font-style != 0 {
+                font-style: $slate-silverstripe-editor--caption-font-style;
+            }
+            @if mixin-exists(slate-silverstripe-editor--caption) {
+                @include slate-silverstripe-editor--caption;
+            }
+        }
+    }
+
+    .captionImage {
+        padding: $slate-silverstripe-editor--captioned-image-padding;
+        background-color: $slate-silverstripe-editor--captioned-image-background-colour;
+        @if mixin-exists(slate-silverstripe-editor--captioned-image) {
+            @include slate-silverstripe-editor--captioned-image;
+        }
+    }
+
+    @if mixin-exists(slate-silverstripe-editor--embed) {
+        .embed {
+            @include slate-silverstripe-editor--embed;
         }
     }
 
@@ -87,4 +116,8 @@
             margin-top: $slate-silverstripe-editor-image-floated-margin-top--trailing;
         }
     }
+
+    @if mixin-exists(slate-silverstripe-typography-partial) {
+        @include slate-silverstripe-typography-partial;
+    }
 }

package/scss/variables/_silverstripe-editor.scss

@@ -7,5 +7,10 @@ $slate-silverstripe-editor-image-floated-margin-horizontal: $slate-default-spaci
 $slate-silverstripe-editor-image-max-width: 60% !default;
 $slate-silverstripe-editor-image-max-width--mobile: 90% !default;
 
-$slate-silverstripe-editor-caption-image-background-colour: #f0f0f0 !default;
-$slate-silverstripe-editor-caption-padding: (0.25 * $slate-default-spacing) (0.25 * $slate-default-spacing) (0.5 * $slate-default-spacing) !default;
+$slate-silverstripe-editor--captioned-image-background-colour: #f0f0f0 !default;
+$slate-silverstripe-editor--captioned-image-padding: (0.25 * $slate-default-spacing) (0.25 * $slate-default-spacing) (0.5 * $slate-default-spacing) !default;
+
+$slate-silverstripe-editor--caption-padding: 0 (0.5 * $slate-default-spacing) !default;
+$slate-silverstripe-editor--caption-color: $slate-muted !default;
+$slate-silverstripe-editor--caption-font-size: 0 !default; // Property excluded when == 0
+$slate-silverstripe-editor--caption-font-style: 0 !default; // Property excluded when == 0