merge branch v2 (release 2.0.0-alpha.3)

marcantondahmen · Feb 29, 2024 · 7f5ae35 · 7f5ae35
2 parents 0b38cec + 17dd89d
commit 7f5ae35
Show file tree

Hide file tree

Showing 12 changed files with 285 additions and 37 deletions.
diff --git a/.github/workflows/dist.sh b/.github/workflows/dist.sh
@@ -67,7 +67,7 @@ git switch $branch || git switch -c $branch
 echo "Syncing changes ..."
 
 rsync \
-	-a \
+	-rcvh \
 	--delete \
 	--stats \
 	--exclude=.git \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,20 @@
 # Changelog
 
-## [v2.0.0-alpha.2](https://github.com/marcantondahmen/automad/commit/6f0ee3a96542fb26de6816430938ba2c5283f1df)
+## [v2.0.0-alpha.3](https://github.com/marcantondahmen/automad/commit/7403a58c8ede73b18b960191f408926901a2f7ad)
 
-Sat, 24 Feb 2024 22:36:24 +0100
+Thu, 29 Feb 2024 21:01:04 +0100
+
+### New Features
+
+- **console**: add migrate command for the migration of version 1 sites ([7403a58c8](https://github.com/marcantondahmen/automad/commit/7403a58c8ede73b18b960191f408926901a2f7ad))
+
+### Bugfixes
+
+- fix syntax highlighting colors ([d40291c37](https://github.com/marcantondahmen/automad/commit/d40291c376fdfd36fcec8961927d28148d3475ea))
+
+## [v2.0.0-alpha.2](https://github.com/marcantondahmen/automad/commit/0b38cec48ca28bd6e6c78f9686e612923fcaefe0)
+
+Sat, 24 Feb 2024 22:43:44 +0100
 
 ### New Features
 
@@ -327,16 +339,3 @@ Sat, 7 Aug 2021 19:45:51 +0200
 - **ui**: fix disabled save button after deleting unused variable field ([fe375915e](https://github.com/marcantondahmen/automad/commit/fe375915e5afaa9fb9ec4798df3c466fd0e283a5))
 - **ui**: fix position of block editor toolbar on large devices ([e19b4b983](https://github.com/marcantondahmen/automad/commit/e19b4b98356d22ed475a8f27489c1d65a26e83e2))
 - **ui**: fix switcher tab update on hashchanges ([2a6725d37](https://github.com/marcantondahmen/automad/commit/2a6725d374ffd0b575b8ce98f7a0eb14707d222e))
-
-## [v1.7.5](https://github.com/marcantondahmen/automad/commit/fe9027615d9a63051fa4e0cca80d7000a2830bae)
-
-Wed, 23 Jun 2021 20:24:36 +0200
-
-### New Features
-
-- **blocks**: add option to exclude or include hidden pages ([64625ddbb](https://github.com/marcantondahmen/automad/commit/64625ddbb25bf224096b94085af98fa178d3f1f9))
-
-### Bugfixes
-
-- **sitemap**: exclude private pages from sitemap.xml ([e4b6169c4](https://github.com/marcantondahmen/automad/commit/e4b6169c4c74be7a0d5cdf2bf09106e05a38b70a))
-- **ui**: remove resize option in image selection dialog ([3af5973c3](https://github.com/marcantondahmen/automad/commit/3af5973c3b406a2ff74545c3a8e2b716de2ed1b1))
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 A flat-file content management system and template engine.
 
 ![Tag](https://img.shields.io/github/v/tag/marcantondahmen/automad?include_prereleases&sort=semver&color=222222)
-![PHP](https://img.shields.io/packagist/dependency-v/automad/automad/php?color=222222)
+![PHP](https://img.shields.io/packagist/dependency-v/automad/automad/php?version=dev-master&color=222222)
 ![Language](https://img.shields.io/github/languages/top/marcantondahmen/automad?color=222222)
 ![Size](https://img.shields.io/github/languages/code-size/marcantondahmen/automad?color=222222)
 ![License](https://img.shields.io/github/license/marcantondahmen/automad?color=222222)
@@ -21,6 +21,8 @@ A flat-file content management system and template engine.
 
 Note that this repository only contains source code. Please follow the instructions below in order to install a fully bundled
 version of Automad using [Docker](https://docker.com) or [Composer](https://getcomposer.org).
+It is also possible to manually [download](https://github.com/automadcms/automad-dist/archive/refs/heads/master.zip)
+and [install](#manual-installation) Automad.
 
 ### Composer
 
@@ -50,6 +52,15 @@ docker logs mysite
 
 Your can now navigate to [localhost](http://localhost) to view your new site.
 
+### Manual Installation
+
+In case you are not able to use Docker or Composer, you can also deploy Automad manually.
+
+1. Download a [distribution bundle](https://github.com/automadcms/automad-dist/archive/refs/heads/master.zip) and move the
+   unpacked content to the document root of your webserver.
+2. Make sure the PHP process has the permissions to write to the document root and its subdirectories including all installed files.
+3. Visit the `/dashboard` route of your site and create the first user.
+
 ## Documentation
 
 Take a look at the [documentation](https://automad.org) to get started with Automad.

diff --git a/automad/src/client/admin/core/factory.ts b/automad/src/client/admin/core/factory.ts
@@ -242,6 +242,16 @@ export const createImagePickerModal = (
 		},
 	});
 
+	const pageImagePicker = pageUrl
+		? html`
+				<am-image-picker
+					${Attr.page}="${pageUrl}"
+					${Attr.label}="${App.text('pageImages')}"
+					${Attr.binding}="${pickerBindingName}"
+				></am-image-picker>
+			`
+		: '';
+
 	create(
 		'am-modal-dialog',
 		[CSS.modalDialogLarge],
@@ -289,14 +299,7 @@ export const createImagePickerModal = (
 						</div>
 					</div>
 				</div>
-				${pageUrl &&
-				html`
-					<am-image-picker
-						${Attr.page}="${getPageURL()}"
-						${Attr.label}="${App.text('pageImages')}"
-						${Attr.binding}="${pickerBindingName}"
-					></am-image-picker>
-				`}
+				${pageImagePicker}
 				<am-image-picker
 					${Attr.label}="${App.text('sharedImages')}"
 					${Attr.binding}="${pickerBindingName}"

diff --git a/automad/src/client/admin/styles/components/card.less b/automad/src/client/admin/styles/components/card.less
@@ -46,6 +46,7 @@
 	&,
 	& * {
 		user-select: none;
+		overflow-wrap: break-word;
 	}
 
 	&--active {

diff --git a/automad/src/client/admin/styles/elements/base.less b/automad/src/client/admin/styles/elements/base.less
@@ -154,7 +154,7 @@
 	& code {
 		font-family: @am-code-font-family;
 		padding: 0.1rem 0.35rem;
-		color: var(--am-prism-1);
+		color: hsl(var(--am-prism-1));
 		background-color: hsl(var(--am-clr-background-faded));
 		border-radius: 0.3rem;
 	}

diff --git a/automad/src/client/admin/styles/elements/contents.less b/automad/src/client/admin/styles/elements/contents.less
@@ -159,7 +159,7 @@
 		display: inline-block;
 		padding: 0 0.4em;
 		border-radius: 3px;
-		color: var(--am-prism-1);
+		color: hsl(var(--am-prism-1));
 	}
 
 	& pre code {

diff --git a/automad/src/client/admin/styles/themes/prism.less b/automad/src/client/admin/styles/themes/prism.less
@@ -34,7 +34,7 @@
 
 code[class*='language-'],
 pre[class*='language-'] {
-	color: var(--am-prism-1);
+	color: hsl(var(--am-prism-1));
 }
 
 :not(pre) > code[class*='language-'] {
@@ -65,7 +65,7 @@ pre[class*='language-'] {
 .token.constant,
 .token.symbol,
 .token.deleted {
-	color: var(--am-prism-2);
+	color: hsl(var(--am-prism-2));
 }
 
 .token.selector,
@@ -74,33 +74,33 @@ pre[class*='language-'] {
 .token.char,
 .token.builtin,
 .token.inserted {
-	color: var(--am-prism-4);
+	color: hsl(var(--am-prism-4));
 }
 
 .token.operator,
 .token.entity,
 .token.url,
 .language-css .token.string,
 .style .token.string {
-	color: var(--am-prism-2);
+	color: hsl(var(--am-prism-2));
 }
 
 .token.atrule,
 .token.attr-value,
 .token.keyword {
-	color: var(--am-prism-4);
+	color: hsl(var(--am-prism-4));
 }
 
 .token.function,
 .token.class-name {
-	color: var(--am-prism-3);
+	color: hsl(var(--am-prism-3));
 	font-weight: bold;
 }
 
 .token.regex,
 .token.important,
 .token.variable {
-	color: var(--am-prism-1);
+	color: hsl(var(--am-prism-1));
 }
 
 .token.important,

diff --git a/automad/src/server/App.php b/automad/src/server/App.php
@@ -56,7 +56,7 @@
  * @license MIT license - https://automad.org/license
  */
 class App {
-	const VERSION = '2.0.0-alpha.2';
+	const VERSION = '2.0.0-alpha.3';
 
 	/**
 	 * Required PHP version.