Merge pull request 'develop' (#9014) from develop into main

Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9014

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.0-calc.b4",
+	"version": "12.118.0-calc.3.b4",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

packages/client/src/router.ts

@@ -93,6 +93,14 @@ export const routes = [{
 		path: '/theme',
 		name: 'theme',
 		component: page(() => import('./pages/settings/theme.vue')),
+	}, {
+		path: '/custom-css',
+		name: 'custom-css',
+		component: page(() => import('./pages/settings/custom-css.vue')),
+	}, {
+		path: '/account-info',
+		name: 'account-info',
+		component: page(() => import('./pages/settings/account-info.vue')),
 	}, {
 		path: '/navbar',
 		name: 'navbar',
@@ -348,6 +356,10 @@ export const routes = [{
 		path: '/other-settings',
 		name: 'other-settings',
 		component: page(() => import('./pages/admin/other-settings.vue')),
+	}, {
+		path: '/other-settings',
+		name: 'other-settings',
+		component: page(() => import('./pages/admin/custom-css.vue')),
 	}, {
 		path: '/',
 		component: page(() => import('./pages/_empty_.vue')),

packages/client/src/widgets/activity.calendar.vue

@@ -19,7 +19,7 @@
 		rx="1" ry="1"
 		fill="none"
 		stroke-width="0.1"
-		stroke="#f73520"/>
+		stroke="#eb6f92"/>
 </svg>
 </template>
 
@@ -52,6 +52,7 @@ props.activity.slice().forEach((d, i) => {
 
 	d.v = peak === 0 ? 0 : d.total / (peak / 2);
 	if (d.v > 1) d.v = 1;
+	// TODO: Make Rose Pine
 	const ch = d.date.weekday === 0 || d.date.weekday === 6 ? 275 : 170;
 	const cs = d.v * 100;
 	const cl = 15 + ((1 - d.v) * 80);