build(release): merge branch develop (release 1.8.6)

marcantondahmen · Aug 31, 2021 · cff6cb5 · cff6cb5
2 parents 09942a0 + 50857b5
commit cff6cb5
Show file tree

Hide file tree

Showing 16 changed files with 162 additions and 94 deletions.
diff --git a/automad/blocks/dist/blocks.min.css b/automad/blocks/dist/blocks.min.css
diff --git a/automad/blocks/dist/blocks.min.js b/automad/blocks/dist/blocks.min.js
diff --git a/automad/package-lock.json b/automad/package-lock.json
diff --git a/automad/package.json b/automad/package.json
@@ -1,6 +1,6 @@
 {
   "name": "automad",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "description": "Automad",
   "author": "Marc Anton Dahmen",
   "license": "MIT",

diff --git a/automad/system/composer.php b/automad/system/composer.php
@@ -62,7 +62,7 @@ class Composer {
 	/**
 	 * The Composer version to be used.
 	 */
-	private $composerVersion = '2.0.8';
+	private $composerVersion = '2.1.6';
 
 	/**
 	 * 	Composer extraction directory within temporary directory.

diff --git a/automad/ui/dist/automad.min.css b/automad/ui/dist/automad.min.css
diff --git a/automad/ui/dist/automad.min.js b/automad/ui/dist/automad.min.js
diff --git a/automad/ui/less/block_editor.less b/automad/ui/less/block_editor.less
@@ -37,9 +37,10 @@
 @import 'editorjs/plugins.less';
 @import 'editorjs/settings.less';
 @import 'editorjs/toolbar.less';
+@import 'editorjs/toolbox.less';
 @import 'editorjs/tooltips.less';
 
-@am-blocks-breakpoint-small: 651px;
+@am-blocks-breakpoint-small: 850px;
 @am-blocks-breakpoint-small-max: (@am-blocks-breakpoint-small - 1px);
 
 @am-block-padding: 0.7rem;

diff --git a/automad/ui/less/editorjs/toolbar.less b/automad/ui/less/editorjs/toolbar.less
@@ -42,6 +42,12 @@
 			border: @am-hairline;
 			background-color: @am-block-dropdown-background;
 			.shadow;
+			padding: 3px;
+			margin-top: 5px;
+
+			&--opened {
+				display: flex;
+			}
 		}
 
 		&__plus {
@@ -56,6 +62,12 @@
 				color: @am-success;
 			}
 
+			@media (max-width: @am-blocks-breakpoint-small-max) {
+				display: inline-flex !important;
+				position: static;
+				transform: none !important;
+			}
+
 			@media (min-width: @am-blocks-breakpoint-small) {
 				left: -2.5rem;
 
@@ -75,12 +87,19 @@
 
 		&__content {
 			position: relative;
-			max-width: @am-block-max-width;
 
 			& .ce-toolbox {
 				margin-left: -0.25rem;
 			}
 
+			@media (max-width: @am-blocks-breakpoint-small-max) {
+				display: flex;
+				align-content: center;
+				margin: 0;
+				width: ~'calc(100% - 35px)';
+				max-width: ~'calc(100% - 35px)';
+			}
+
 			@media (min-width: @am-blocks-breakpoint-small) {
 				& .ce-toolbox {
 					margin-left: 0.55rem;
@@ -97,9 +116,12 @@
 			transform: translate3d(-0.8rem, 0.165rem, 0);
 
 			@media (max-width: @am-blocks-breakpoint-small-max) {
+				position: absolute;
 				top: 0.175rem;
 				right: -1.9rem;
 				transform: none !important;
+				display: flex;
+				align-items: center;
 			}
 		}
 
@@ -121,55 +143,4 @@
 			}
 		}
 	}
-
-	& .ce-toolbox {
-		overflow: hidden;
-		font-size: 0.86rem;
-		border-radius: @am-radius + 0.2rem;
-		background-color: @am-block-dropdown-background;
-
-		@media (min-width: @am-blocks-breakpoint-small) {
-			border: @am-hairline;
-			.shadow;
-		}
-
-		&__button {
-			height: 2.5rem;
-			width: 2.5rem;
-			color: @am-text;
-			.transition(color 0.2s, background-color 0.2s;);
-
-			&:first-child {
-				border-top-left-radius: @am-radius - @am-border-width;
-				border-bottom-left-radius: @am-radius - @am-border-width;
-			}
-
-			&:last-child {
-				border-top-right-radius: @am-radius - @am-border-width;
-				border-bottom-right-radius: @am-radius - @am-border-width;
-			}
-
-			&:hover,
-			&:focus {
-				color: @am-text;
-				background-color: @am-block-button-hover-background !important;
-			}
-
-			&.ce-toolbox__button--active {
-				color: @am-success;
-				animation: none !important;
-
-				&:hover {
-					color: @am-success;
-				}
-			}
-		}
-
-		& [data-tool='header'],
-		& [data-tool='image'],
-		& [data-tool='buttons'],
-		& [data-tool='code'] {
-			border-left: @am-hairline;
-		}
-	}
 }
diff --git a/automad/ui/less/editorjs/toolbox.less b/automad/ui/less/editorjs/toolbox.less
@@ -0,0 +1,95 @@
+/*
+ *                    ....
+ *                  .:   '':.
+ *                  ::::     ':..
+ *                  ::.         ''..
+ *       .:'.. ..':.:::'    . :.   '':.
+ *      :.   ''     ''     '. ::::.. ..:
+ *      ::::.        ..':.. .''':::::  .
+ *      :::::::..    '..::::  :. ::::  :
+ *      ::'':::::::.    ':::.'':.::::  :
+ *      :..   ''::::::....':     ''::  :
+ *      :::::.    ':::::   :     .. '' .
+ *   .''::::::::... ':::.''   ..''  :.''''.
+ *   :..:::'':::::  :::::...:''        :..:
+ *   ::::::. '::::  ::::::::  ..::        .
+ *   ::::::::.::::  ::::::::  :'':.::   .''
+ *   ::: '::::::::.' '':::::  :.' '':  :
+ *   :::   :::::::::..' ::::  ::...'   .
+ *   :::  .::::::::::   ::::  ::::  .:'
+ *    '::'  '':::::::   ::::  : ::  :
+ *              '::::   ::::  :''  .:
+ *               ::::   ::::    ..''
+ *               :::: ..:::: .:''
+ *                 ''''  '''''
+ * 
+ *
+ * AUTOMAD
+ *
+ * Copyright (c) 2020-2021 by Marc Anton Dahmen
+ * https://marcdahmen.de
+ *
+ * Licensed under the MIT license.
+ */
+
+.am-block-editor {
+	& .ce-toolbox {
+		overflow: scroll;
+		font-size: 0.86rem;
+		border-radius: @am-radius + 0.2rem;
+		background-color: @am-block-dropdown-background;
+
+		@media (max-width: @am-blocks-breakpoint-small-max) {
+			position: static;
+			transform: none !important;
+			align-items: center;
+			overflow-x: auto;
+		}
+
+		@media (min-width: @am-blocks-breakpoint-small) {
+			border: @am-hairline;
+			.shadow;
+		}
+
+		&__button {
+			height: 2.5rem;
+			width: 2.5rem;
+			color: @am-text;
+			.transition(color 0.2s, background-color 0.2s;);
+
+			&:first-child {
+				border-top-left-radius: @am-radius - @am-border-width;
+				border-bottom-left-radius: @am-radius - @am-border-width;
+			}
+
+			&:last-child {
+				border-top-right-radius: @am-radius - @am-border-width;
+				border-bottom-right-radius: @am-radius - @am-border-width;
+			}
+
+			&:hover,
+			&:focus {
+				color: @am-text;
+				background-color: @am-block-button-hover-background !important;
+			}
+
+			&.ce-toolbox__button--active {
+				color: @am-success;
+				animation: none !important;
+
+				&:hover {
+					color: @am-success;
+				}
+			}
+		}
+
+		@media (min-width: @am-blocks-breakpoint-small) {
+			& [data-tool='header'],
+			& [data-tool='image'],
+			& [data-tool='buttons'],
+			& [data-tool='code'] {
+				border-left: @am-hairline;
+			}
+		}
+	}
+}
diff --git a/automad/version.php b/automad/version.php
@@ -1 +1 @@
-<?php define('AM_VERSION', '1.8.5'); ?>
+<?php define('AM_VERSION', '1.8.6'); ?>
diff --git a/packages/standard/dark/theme.json b/packages/standard/dark/theme.json
@@ -2,7 +2,7 @@
 	"name": "Dark",
 	"description": "A dark and elegant multi-purpose theme",
 	"author": "Marc Anton Dahmen",
-	"version": "1.8.5",
+	"version": "1.8.6",
 	"license": "MIT",
 	"masks": {
 		"page": [

diff --git a/packages/standard/light/theme.json b/packages/standard/light/theme.json
@@ -2,7 +2,7 @@
 	"name": "Light",
 	"description": "A light and elegant multi-purpose theme",
 	"author": "Marc Anton Dahmen",
-	"version": "1.8.5",
+	"version": "1.8.6",
 	"license": "MIT",
 	"masks": {
 		"page": [

diff --git a/packages/standard/package-lock.json b/packages/standard/package-lock.json
diff --git a/packages/standard/package.json b/packages/standard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "description": "A standard collection of elegant Automad themes",
   "main": "gulpfile.js",
   "private": true,

diff --git a/pages/project.txt b/pages/project.txt
@@ -41,13 +41,13 @@ hidden: on
 -
 
 +main: {
-    "time": 1628452422764,
+    "time": 1630342273082,
     "blocks": [
         {
             "type": "section",
             "data": {
                 "content": {
-                    "time": 1628452367348,
+                    "time": 1630342272626,
                     "blocks": [
                         {
                             "type": "section",
@@ -186,7 +186,7 @@ hidden: on
                             "type": "section",
                             "data": {
                                 "content": {
-                                    "time": 1628452366888,
+                                    "time": 1630342272170,
                                     "blocks": [
                                         {
                                             "type": "paragraph",
@@ -211,7 +211,7 @@ hidden: on
                                         {
                                             "type": "buttons",
                                             "data": {
-                                                "primaryText": "<am-fontsize style=\"font-size: 120%;\">About Pagelists</am-fontsize>",
+                                                "primaryText": "<am-fontsize style=\"font-size: 120%;\">More About Pagelists</am-fontsize>",
                                                 "primaryLink": "/pagelists",
                                                 "primaryStyle": {
                                                     "borderRadius": "0.4rem",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php define('AM_VERSION', '1.8.5'); ?>
		<?php define('AM_VERSION', '1.8.6'); ?>