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

marcantondahmen · Aug 12, 2021 · 09942a0 · 09942a0
2 parents 5512e55 + f62b5d4
commit 09942a0
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 11 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.4",
+  "version": "1.8.5",
   "description": "Automad",
   "author": "Marc Anton Dahmen",
   "license": "MIT",

diff --git a/automad/ui/components/layout/pagedata.php b/automad/ui/components/layout/pagedata.php
@@ -406,6 +406,10 @@ private function settings() {
 	 * @return string the slug input field HTML
 	 */
 	private function slug() {
+		if ($this->url == '/') {
+			return '';
+		}
+
 		$slug = Page::extractSlugFromPath($this->Page->path);
 
 		return $this->input(

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/version.php b/automad/version.php
@@ -1 +1 @@
-<?php define('AM_VERSION', '1.8.4'); ?>
+<?php define('AM_VERSION', '1.8.5'); ?>
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.4",
+	"version": "1.8.5",
 	"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.4",
+	"version": "1.8.5",
 	"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.4",
+  "version": "1.8.5",
   "description": "A standard collection of elegant Automad themes",
   "main": "gulpfile.js",
   "private": true,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php define('AM_VERSION', '1.8.4'); ?>
		<?php define('AM_VERSION', '1.8.5'); ?>