wip

locales/ja-JP.yml

@@ -1054,6 +1054,8 @@ _profile:
   metadataDescription: "プロフィールに表として4つまでの追加情報を表示することができます。"
   metadataLabel: "ラベル"
   metadataContent: "内容"
+  changeAvatar: "アバター画像を変更"
+  changeBanner: "バナー画像を変更"
 
 _exportOrImport:
   allNotes: "全てのノート"

src/client/components/follow-button.vue

 <template>
 <button class="kpoogebi _button"
-	:class="{ wait, active: isFollowing || hasPendingFollowRequestFromYou, full }"
+	:class="{ wait, active: isFollowing || hasPendingFollowRequestFromYou, full, large }"
 	@click="onClick"
 	:disabled="wait"
-	v-if="isFollowing != null"
 >
 	<template v-if="!wait">
 		<template v-if="hasPendingFollowRequestFromYou && user.isLocked">
@@ -44,6 +43,11 @@ export default defineComponent({
 			required: false,
 			default: false,
 		},
+		large: {
+			type: Boolean,
+			required: false,
+			default: false,
+		},
 	},
 
 	data() {
@@ -149,6 +153,12 @@ export default defineComponent({
 		font-size: 14px;
 	}
 
+	&.large {
+		font-size: 16px;
+		height: 38px;
+		padding: 0 12px 0 16px;
+	}
+
 	&:not(.full) {
 		width: 31px;
 	}

src/client/pages/about-misskey.vue

@@ -7,7 +7,7 @@
 			<div style="opacity: 0.5;">v{{ version }}</div>
 		</div>
 	</section>
-	<section class="_formItem" style="text-align: center;">
+	<section class="_formItem" style="text-align: center; padding: 0 16px;">
 		{{ $t('_aboutMisskey.about') }}
 	</section>
 	<FormGroup>

src/client/pages/channel.vue

@@ -20,7 +20,7 @@
 		</div>
 	</div>
 
-	<XPostForm :channel="channel" class="post-form _content _panel _vMargin" fixed v-if="this.$store.getters.isSignedIn"/>
+	<XPostForm :channel="channel" class="post-form _content _panel _vMargin" fixed v-if="$store.getters.isSignedIn"/>
 
 	<XTimeline class="_content _vMargin" src="channel" :channel="channelId" @before="before" @after="after"/>
 </div>

src/client/pages/channels.vue

 <template>
 <div>
-	<div class="_section" style="padding: 0;" v-if="this.$store.getters.isSignedIn">
+	<div class="_section" style="padding: 0;" v-if="$store.getters.isSignedIn">
 		<MkTab class="_content" v-model:value="tab">
 			<option value="featured"><Fa :icon="faFireAlt"/> {{ $t('_channel.featured') }}</option>
 			<option value="following"><Fa :icon="faHeart"/> {{ $t('_channel.following') }}</option>

src/client/pages/explore.vue

 <template>
-<div>
+<div class="lznhrdub">
 	<div class="_section">
 		<MkInput v-model:value="query" :debounce="true" type="search"><template #icon><Fa :icon="faSearch"/></template><span>{{ $t('searchUser') }}</span></MkInput>
 
@@ -186,6 +186,11 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+.lznhrdub {
+	max-width: 1400px;
+	margin: 0 auto;
+}
+
 .localfedi7 {
 	color: #fff;
 	padding: 16px;

src/client/pages/pages.vue

 <template>
 <div>
-	<MkTab v-model:value="tab" v-if="this.$store.getters.isSignedIn">
+	<MkTab v-model:value="tab" v-if="$store.getters.isSignedIn">
 		<option value="featured"><Fa :icon="faFireAlt"/> {{ $t('_pages.featured') }}</option>
 		<option value="my"><Fa :icon="faEdit"/> {{ $t('_pages.my') }}</option>
 		<option value="liked"><Fa :icon="faHeart"/> {{ $t('_pages.liked') }}</option>

src/client/pages/settings/profile.vue

 <template>
-<FormBase class="llvierxe">
-	<div class="header _formItem" :style="{ backgroundImage: $store.state.i.bannerUrl ? `url(${ $store.state.i.bannerUrl })` : null }" @click="changeBanner">
-		<MkAvatar class="avatar" :user="$store.state.i" :disable-preview="true" :disable-link="true" @click.stop="changeAvatar"/>
-	</div>
+<FormBase>
+	<FormGroup>
+		<div class="_formItem _formPanel llvierxe" :style="{ backgroundImage: $store.state.i.bannerUrl ? `url(${ $store.state.i.bannerUrl })` : null }">
+			<MkAvatar class="avatar" :user="$store.state.i"/>
+		</div>
+		<FormButton @click="changeAvatar" primary>{{ $t('_profile.changeAvatar') }}</FormButton>
+		<FormButton @click="changeBanner" primary>{{ $t('_profile.changeBanner') }}</FormButton>
+	</FormGroup>
 
 	<FormInput v-model:value="name" :max="30">
 		<span>{{ $t('_profile.name') }}</span>
@@ -245,30 +249,26 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 .llvierxe {
-	> .header {
-		position: relative;
-		height: 150px;
-		overflow: hidden;
-		background-size: cover;
-		background-position: center;
-		border-radius: 5px;
-		border: solid 1px var(--divider);
-		box-sizing: border-box;
-		cursor: pointer;
+	position: relative;
+	height: 150px;
+	background-size: cover;
+	background-position: center;
 
-		> .avatar {
-			position: absolute;
-			top: 0;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			display: block;
-			width: 72px;
-			height: 72px;
-			margin: auto;
-			cursor: pointer;
-			box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.5);
-		}
+	> * {
+		pointer-events: none;
+	}
+
+	> .avatar {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		display: block;
+		width: 72px;
+		height: 72px;
+		margin: auto;
+		box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.5);
 	}
 }
 </style>

src/client/pages/user/index.timeline.vue

 <template>
-<div class="kjeftjfm" v-size="{ max: [500] }">
-	<div class="with">
-		<button class="_button" @click="with_ = null" :class="{ active: with_ === null }">{{ $t('notes') }}</button>
-		<button class="_button" @click="with_ = 'replies'" :class="{ active: with_ === 'replies' }">{{ $t('notesAndReplies') }}</button>
-		<button class="_button" @click="with_ = 'files'" :class="{ active: with_ === 'files' }">{{ $t('withFiles') }}</button>
-	</div>
-	<XNotes ref="timeline" :pagination="pagination" @before="$emit('before')" @after="e => $emit('after', e)"/>
+<div>
+	<MkTab v-model:value="with_" class="_vMargin">
+		<option :value="null">{{ $t('notes') }}</option>
+		<option value="replies">{{ $t('notesAndReplies') }}</option>
+		<option value="files">{{ $t('withFiles') }}</option>
+	</MkTab>
+	<XNotes ref="timeline" class="_vMargin" :pagination="pagination" @before="$emit('before')" @after="e => $emit('after', e)"/>
 </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
 import XNotes from '@/components/notes.vue';
+import MkTab from '@/components/tab.vue';
 import * as os from '@/os';
 
 export default defineComponent({
 	components: {
-		XNotes
+		XNotes,
+		MkTab,
 	},
 
 	props: {
@@ -54,29 +56,3 @@ export default defineComponent({
 	},
 });
 </script>
-
-<style lang="scss" scoped>
-.kjeftjfm {
-	> .with {
-		display: flex;
-		margin-bottom: var(--margin);
-
-		> button {
-			flex: 1;
-			padding: 11px 8px 8px 8px;
-			border-bottom: solid 3px transparent;
-
-			&.active {
-				color: var(--accent);
-				border-bottom-color: var(--accent);
-			}
-		}
-	}
-
-	&.max-width_500px {
-		> .with {
-			font-size: 80%;
-		}
-	}
-}
-</style>

src/client/style.scss

@@ -241,7 +241,7 @@ hr {
 	background: var(--panel);
 	border-radius: var(--radius);
 	//border: var(--panelBorder);
-	box-shadow: var(--panelShadow);
+	//box-shadow: var(--panelShadow);
 	overflow: hidden;
 }
 

src/client/themes/d-black.json5

@@ -8,7 +8,7 @@
 
 	props: {
 		divider: '#2d2d2d',
-		panel: '#0a0a0a',
+		panel: '#111111',
 		panelHeaderBg: '@panel',
 		panelHeaderDivider: '@divider',
 		panelShadow: '" 0 8px 24px rgb(0 0 0 / 25%)',

src/client/ui/default.vue

@@ -294,7 +294,7 @@ export default defineComponent({
 			-webkit-backdrop-filter: blur(32px);
 			backdrop-filter: blur(32px);
 			background-color: var(--header);
-			border-bottom: solid 1px var(--divider);
+			//border-bottom: solid 1px var(--divider);
 			user-select: none;
 		}
 

src/client/ui/visitor.vue

 <template>
-<DesignA/>
+<DesignB/>
 <XCommon/>
 </template>
 

src/client/ui/visitor/a.vue

@@ -2,12 +2,6 @@
 <div class="mk-app">
 	<div class="banner" v-if="$route.path === '/'" :style="{ backgroundImage: `url(${ $store.state.instance.meta.bannerUrl })` }">
 		<div>
-			<header>
-				<MkA class="link" to="/">{{ $t('home') }}</MkA>
-				<MkA class="link" to="/announcements">{{ $t('announcements') }}</MkA>
-				<MkA class="link" to="/channels">{{ $t('channel') }}</MkA>
-				<MkA class="link" to="/about">{{ $t('aboutX', { x: instanceName }) }}</MkA>
-			</header>
 			<h1 v-if="meta"><img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span></h1>
 			<div class="about" v-if="meta">
 				<div class="desc" v-html="meta.description || $t('introMisskey')"></div>
@@ -20,16 +14,6 @@
 	</div>
 	<div class="banner-mini" v-else :style="{ backgroundImage: `url(${ $store.state.instance.meta.bannerUrl })` }">
 		<div>
-			<header>
-				<MkA class="link" to="/">{{ $t('home') }}</MkA>
-				<MkA class="link" to="/announcements">{{ $t('announcements') }}</MkA>
-				<MkA class="link" to="/channels">{{ $t('channel') }}</MkA>
-				<MkA class="link" to="/about">{{ $t('aboutX', { x: instanceName }) }}</MkA>
-				<div class="action">
-					<button class="_button primary" @click="signup()">{{ $t('signup') }}</button>
-					<button class="_button" @click="signin()">{{ $t('login') }}</button>
-				</div>
-			</header>
 			<h1 v-if="meta"><img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span></h1>
 		</div>
 	</div>
@@ -62,10 +46,8 @@ import { host, instanceName } from '@/config';
 import { search } from '@/scripts/search';
 import * as os from '@/os';
 import MkPagination from '@/components/ui/pagination.vue';
-import XSigninDialog from '@/components/signin-dialog.vue';
-import XSignupDialog from '@/components/signup-dialog.vue';
 import MkButton from '@/components/ui/button.vue';
-import XHeader from '../_common_/header.vue';
+import XHeader from './header.vue';
 
 const DESKTOP_THRESHOLD = 1100;
 
@@ -150,18 +132,6 @@ export default defineComponent({
 		onTransition() {
 			if (window._scroll) window._scroll();
 		},
-
-		signin() {
-			os.popup(XSigninDialog, {
-				autoSet: true
-			}, {}, 'closed');
-		},
-
-		signup() {
-			os.popup(XSignupDialog, {
-				autoSet: true
-			}, {}, 'closed');
-		}
 	}
 });
 </script>
@@ -264,59 +234,6 @@ export default defineComponent({
 	}
 
 	> .main {
-		> header {
-			position: relative;
-			z-index: 1;
-			background: var(--panel);
-			padding: 0 32px;
-			text-align: left;
-			overflow: auto;
-			white-space: nowrap;
-
-			> .link {
-				display: inline-block;
-				line-height: 60px;
-				padding: 0 0.7em;
-
-				&.MkA-active {
-					box-shadow: 0 -2px 0 0 var(--accent) inset;
-				}
-			}
-		}
-
-		> .banner {
-			position: relative;
-			width: 100%;
-			height: 200px;
-			background-size: cover;
-			background-position: center;
-
-			&.asBg {
-				position: absolute;
-				left: 0;
-				height: 320px;
-			}
-
-			&:after {
-				content: "";
-				display: block;
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				width: 100%;
-				height: 64px;
-				background: linear-gradient(transparent, var(--bg));
-			}
-
-			> h1 {
-				margin: 0;
-				text-align: center;
-				color: #fff;
-				text-shadow: 0 0 8px #000;
-				line-height: 200px;
-			}
-		}
-
 		> .contents {
 			position: relative;
 			z-index: 1;
@@ -326,14 +243,6 @@ export default defineComponent({
 				top: 0;
 				left: 0;
 				z-index: 1000;
-				height: 60px;
-				width: 100%;
-				line-height: 60px;
-				text-align: center;
-				-webkit-backdrop-filter: blur(32px);
-				backdrop-filter: blur(32px);
-				background-color: var(--header);
-				border-bottom: 1px solid var(--divider);
 			}
 
 			> .powered-by {

src/client/ui/visitor/b.vue

@@ -8,7 +8,7 @@
 				<div class="desc" v-html="meta.description || $t('introMisskey')"></div>
 			</div>
 			<div class="action">
-				<button class="_button primary" @click="signup()">{{ $t('signup') }}</button>
+				<button class="_buttonPrimary" @click="signup()">{{ $t('signup') }}</button>
 				<button class="_button" @click="signin()">{{ $t('login') }}</button>
 			</div>
 			<div class="announcements panel">
@@ -27,13 +27,6 @@
 	</div>
 
 	<div class="main">
-		<header>
-			<MkA class="link" to="/">{{ $t('home') }}</MkA>
-			<MkA class="link" to="/announcements">{{ $t('announcements') }}</MkA>
-			<MkA class="link" to="/channels">{{ $t('channel') }}</MkA>
-			<MkA class="link" to="/about">{{ $t('aboutX', { x: instanceName }) }}</MkA>
-		</header>
-
 		<div v-if="narrow" class="banner" :style="{ backgroundImage: `url(${ $store.state.instance.meta.bannerUrl })` }">
 			<h1 v-if="meta"><img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span></h1>
 		</div>
@@ -181,6 +174,7 @@ export default defineComponent({
 			left: 0;
 			width: 500px;
 			height: 100vh;
+			overflow: auto;
 			background-position: center;
 			background-size: cover;
 
@@ -235,11 +229,9 @@ export default defineComponent({
 					box-sizing: border-box;
 					text-align: center;
 					border-radius: 999px;
-					background: var(--panel);
 
-					&.primary {
-						background: var(--accent);
-						color: #fff;
+					&._button {
+						background: var(--panel);
 					}
 
 					&:first-child {

src/client/ui/visitor/header.vue

+<template>
+<div class="sqxihjet">
+	<div class="content">
+		<MkA to="/" class="link" active-class="active">{{ $t('home') }}</MkA>
+		<MkA to="/explore" class="link" active-class="active">{{ $t('explore') }}</MkA>
+		<MkA to="/featured" class="link" active-class="active">{{ $t('featured') }}</MkA>
+		<MkA to="/channels" class="link" active-class="active">{{ $t('channel') }}</MkA>
+		<div class="page link" v-if="info">
+			<div class="title">
+				<Fa v-if="info.icon" :icon="info.icon" :key="info.icon" class="icon"/>
+				<MkAvatar v-else-if="info.avatar" class="avatar" :user="info.avatar" :disable-preview="true"/>
+				<span v-if="info.title" class="text">{{ info.title }}</span>
+				<MkUserName v-else-if="info.userName" :user="info.userName" :nowrap="false" class="text"/>
+			</div>
+			<button class="_button action" v-if="info.action" @click.stop="info.action.handler"><Fa :icon="info.action.icon" :key="info.action.icon"/></button>
+		</div>
+		<div class="right">
+			<button class="_button search" @click="search()"><Fa :icon="faSearch" class="icon"/><span>{{ $t('search') }}</span></button>
+			<button class="_buttonPrimary signup" @click="signup()">{{ $t('signup') }}</button>
+			<button class="_button login" @click="signin()">{{ $t('login') }}</button>
+		</div>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { faSearch } from '@fortawesome/free-solid-svg-icons';
+import XSigninDialog from '@/components/signin-dialog.vue';
+import XSignupDialog from '@/components/signup-dialog.vue';
+import * as os from '@/os';
+import { search } from '@/scripts/search';
+
+export default defineComponent({
+	props: {
+		info: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			faSearch
+		};
+	},
+
+	methods: {
+		signin() {
+			os.popup(XSigninDialog, {
+				autoSet: true
+			}, {}, 'closed');
+		},
+
+		signup() {
+			os.popup(XSignupDialog, {
+				autoSet: true
+			}, {}, 'closed');
+		},
+
+		search
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.sqxihjet {
+	$height: 60px;
+	line-height: $height;
+	background: var(--panel);
+
+	> .content {
+		max-width: 1400px;
+		margin: 0 auto;
+		display: flex;
+		align-items: center;
+
+		> .link {
+			display: inline-block;
+			padding: 0 16px;
+			line-height: $height - 4px;
+			border-top: solid 2px transparent;
+			border-bottom: solid 2px transparent;
+
+			&.page {
+				border-bottom-color: var(--accent);
+			}
+		}
+
+		> .page {
+			> .title {
+				display: inline-block;
+				vertical-align: bottom;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				position: relative;
+
+				> .indicator {
+					position: absolute;
+					top: initial;
+					right: 8px;
+					top: 8px;
+					color: var(--indicator);
+					font-size: 12px;
+					animation: blink 1s infinite;
+				}
+
+				> .icon + .text {
+					margin-left: 8px;
+				}
+
+				> .avatar {
+					$size: 32px;
+					display: inline-block;
+					width: $size;
+					height: $size;
+					vertical-align: middle;
+					margin-right: 8px;
+					pointer-events: none;
+				}
+
+				&._button {
+					&:hover {
+						color: var(--fgHighlighted);
+					}
+				}
+
+				&.selected {
+					box-shadow: 0 -2px 0 0 var(--accent) inset;
+					color: var(--fgHighlighted);
+				}
+			}
+
+			> .action {
+				padding: 0 0 0 16px;
+			}
+		}
+
+		> .right {
+			margin-left: auto;
+
+			> .search {
+				background: var(--bg);
+				border-radius: 999px;
+				width: 230px;
+				line-height: $height - 20px;
+				margin-right: 16px;
+				text-align: left;
+
+				> * {
+					opacity: 0.7;
+				}
+
+				> .icon {
+					padding: 0 16px;
+				}
+			}
+
+			> .signup {
+				border-radius: 999px;
+				padding: 0 24px;
+				line-height: $height - 20px;
+			}
+
+			> .login {
+				padding: 0 16px;
+			}
+		}
+	}
+}
+</style>