Merge branch 'develop'

2 files changed, 8 insertions, 1 deletions

diff --git a/src/server/web/boot.js b/src/server/web/boot.js
index 1c94e6e4f4..e2fd137f95 100644
--- a/src/server/web/boot.js
+++ b/src/server/web/boot.js
@@ -107,6 +107,13 @@
 		document.documentElement.style.backgroundImage = `url(${wallpaper})`;
 	}
 
+	const customCss = localStorage.getItem('customCss');
+	if (customCss && customCss.length > 0) {
+		const style = document.createElement('style');
+		style.innerHTML = customCss;
+		head.appendChild(style);
+	}
+
 	// eslint-disable-next-line no-inner-declarations
 	function renderError(code, details) {
 		document.documentElement.innerHTML = `
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index cc343063af..50fea757f2 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -18,7 +18,7 @@ import { fetchMeta } from '@/misc/fetch-meta';
 import { genOpenapiSpec } from '../api/openapi/gen-spec';
 import config from '@/config';
 import { Users, Notes, Emojis, UserProfiles, Pages, Channels, Clips, GalleryPosts } from '../../models';
-import parseAcct from '@/misc/acct/parse';
+import { parseAcct } from '@/misc/acct';
 import { getNoteSummary } from '@/misc/get-note-summary';
 import { getConnection } from 'typeorm';
 import { redisClient } from '../../db/redis';