Merge branch 'develop'

locales/index.js

@@ -24,7 +24,6 @@ const languages = [
 	'fr-FR',
 	'id-ID',
 	'it-IT',
-	'ja-NY',
 	'ja-JP',
 	'ja-KS',
 	'kab-KAB',
@@ -57,7 +56,6 @@ module.exports = Object.entries(locales)
 		const [lang] = k.split('-');
 		switch (k) {
 			case 'ja-JP': return v;
-			case 'ja-NY':
 			case 'ja-KS':
 			case 'en-US': return merge(locales['ja-JP'], v);
 			default: return merge(

package.json

@@ -1,10 +1,10 @@
 {
 	"name": "misskey",
-	"version": "12.102.1-simkey",
+	"version": "12.102.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/sim1222/misskey.git"
+		"url": "https://github.com/misskey-dev/misskey.git"
 	},
 	"private": true,
 	"scripts": {

packages/backend/src/server/web/manifest.json

@@ -4,7 +4,7 @@
 	"start_url": "/",
 	"display": "standalone",
 	"background_color": "#313a42",
-	"theme_color": "#a7dc4e",
+	"theme_color": "#86b300",
 	"icons": [
 		{
 			"src": "/static-assets/icons/192.png",

packages/backend/src/server/web/views/base.pug

@@ -19,8 +19,8 @@ html
 		meta(charset='utf-8')
 		meta(name='application-name' content='Misskey')
 		meta(name='referrer' content='origin')
-		meta(name='theme-color' content='#a7dc4e')
+		meta(name='theme-color' content='#86b300')
-		meta(name='theme-color-orig' content='#a7dc4e')
+		meta(name='theme-color-orig' content='#86b300')
 		meta(property='og:site_name' content= instanceName || 'Misskey')
 		meta(name='viewport' content='width=device-width, initial-scale=1')
 		link(rel='icon' href= icon || '/favicon.ico')

packages/client/src/components/global/header.vue

@@ -1,78 +1,39 @@
 <template>
-	<div
+<div ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
-		ref="el"
+	<template v-if="info">
-		class="fdidabkb"
+		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
-		:class="{ slim: narrow, thin: thin_ }"
+			<MkAvatar v-if="info.avatar" class="avatar" :user="info.avatar" :disable-preview="true" :show-indicator="true"/>
-		:style="{ background: bg }"
+			<i v-else-if="info.icon" class="icon" :class="info.icon"></i>
-		@click="onClick"
-	>
-		<template v-if="info">
-			<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
-				<MkAvatar
-					v-if="info.avatar"
-					class="avatar"
-					:user="info.avatar"
-					:disable-preview="true"
-					:show-indicator="true"
-				/>
-				<i v-else-if="info.icon" class="icon" :class="info.icon"></i>
 
-				<div class="title">
+			<div class="title">
-					<MkUserName v-if="info.userName" :user="info.userName" :nowrap="true" class="title" />
+				<MkUserName v-if="info.userName" :user="info.userName" :nowrap="true" class="title"/>
-					<div v-else-if="info.title" class="title">{{ info.title }}</div>
+				<div v-else-if="info.title" class="title">{{ info.title }}</div>
-					<div v-if="!narrow && info.subtitle" class="subtitle">{{ info.subtitle }}</div>
+				<div v-if="!narrow && info.subtitle" class="subtitle">
-					<div v-if="narrow && hasTabs" class="subtitle activeTab">
+					{{ info.subtitle }}
-						{{ info.tabs.find(tab => tab.active)?.title }}
+				</div>
-						<i class="chevron fas fa-chevron-down"></i>
+				<div v-if="narrow && hasTabs" class="subtitle activeTab">
-					</div>
+					{{ info.tabs.find(tab => tab.active)?.title }}
+					<i class="chevron fas fa-chevron-down"></i>
 				</div>
 			</div>
-			<div v-if="!narrow || hideTitle" class="tabs">
+		</div>
-				<button
+		<div v-if="!narrow || hideTitle" class="tabs">
-					v-for="tab in info.tabs"
+			<button v-for="tab in info.tabs" v-tooltip="tab.title" class="tab _button" :class="{ active: tab.active }" @click="tab.onClick">
-					v-tooltip="tab.title"
+				<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
-					class="tab _button"
+				<span v-if="!tab.iconOnly" class="title">{{ tab.title }}</span>
-					:class="{ active: tab.active }"
-					@click="tab.onClick"
-				>
-					<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
-					<span v-if="!tab.iconOnly" class="title">{{ tab.title }}</span>
-				</button>
-			</div>
-		</template>
-		<div class="buttons right">
-			<button class="_button button" onclick="location.reload();">
-				<i class="fa-solid fa-arrow-rotate-right"></i>
-			</button>
-			<template v-if="info && info.actions && !narrow">
-				<template v-for="action in info.actions">
-					<MkButton v-if="action.asFullButton" class="fullButton" primary @click.stop="action.handler">
-						<i :class="action.icon" style="margin-right: 6px;"></i>
-						{{ action.text }}
-					</MkButton>
-					<button
-						v-else
-						v-tooltip="action.text"
-						class="_button button"
-						:class="{ highlighted: action.highlighted }"
-						@click.stop="action.handler"
-						@touchstart="preventDrag"
-					>
-						<i :class="action.icon"></i>
-					</button>
-				</template>
-			</template>
-			<button
-				v-if="shouldShowMenu"
-				v-tooltip="$ts.menu"
-				class="_button button"
-				@click.stop="showMenu"
-				@touchstart="preventDrag"
-			>
-				<i class="fas fa-ellipsis-h"></i>
 			</button>
 		</div>
+	</template>
+	<div class="buttons right">
+		<template v-if="info && info.actions && !narrow">
+			<template v-for="action in info.actions">
+				<MkButton v-if="action.asFullButton" class="fullButton" primary @click.stop="action.handler"><i :class="action.icon" style="margin-right: 6px;"></i>{{ action.text }}</MkButton>
+				<button v-else v-tooltip="action.text" class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler" @touchstart="preventDrag"><i :class="action.icon"></i></button>
+			</template>
+		</template>
+		<button v-if="shouldShowMenu" v-tooltip="$ts.menu" class="_button button" @click.stop="showMenu" @touchstart="preventDrag"><i class="fas fa-ellipsis-h"></i></button>
 	</div>
+</div>
 </template>
 
 <script lang="ts">
@@ -189,7 +150,7 @@ export default defineComponent({
 			onUnmounted(() => {
 				globalEvents.off('themeChanged', calcBg);
 			});
-
+		
 			if (el.value.parentElement) {
 				narrow.value = el.value.parentElement.offsetWidth < 500;
 				const ro = new ResizeObserver((entries, observer) => {
@@ -266,7 +227,7 @@ export default defineComponent({
 	> .buttons {
 		--margin: 8px;
 		display: flex;
-		align-items: center;
+    align-items: center;
 		height: var(--height);
 		margin: 0 var(--margin);