nanka iroiro

9 files changed, 314 insertions, 230 deletions

diff --git a/src/web/app/common/tags/index.ts b/src/web/app/common/tags/index.ts
index 35a9f4586e..2f4e1181d4 100644
--- a/src/web/app/common/tags/index.ts
+++ b/src/web/app/common/tags/index.ts
@@ -28,3 +28,4 @@ require('./reaction-picker.tag');
 require('./reactions-viewer.tag');
 require('./reaction-icon.tag');
 require('./post-menu.tag');
+require('./nav-links.tag');
diff --git a/src/web/app/common/tags/nav-links.tag b/src/web/app/common/tags/nav-links.tag
new file mode 100644
index 0000000000..b09e376b34
--- /dev/null
+++ b/src/web/app/common/tags/nav-links.tag
@@ -0,0 +1,7 @@
+<mk-nav-links>
+	<a href={ CONFIG.aboutUrl }>%i18n:common.tags.mk-nav-links.about%</a><i>・</i><a href={ CONFIG.statsUrl }>%i18n:common.tags.mk-nav-links.stats%</a><i>・</i><a href={ CONFIG.statusUrl }>%i18n:common.tags.mk-nav-links.status%</a><i>・</i><a href="http://zawazawa.jp/misskey/">%i18n:common.tags.mk-nav-links.wiki%</a><i>・</i><a href="https://github.com/syuilo/misskey/blob/master/DONORS.md">%i18n:common.tags.mk-nav-links.donors%</a><i>・</i><a href="https://github.com/syuilo/misskey">%i18n:common.tags.mk-nav-links.repository%</a><i>・</i><a href={ CONFIG.devUrl }>%i18n:common.tags.mk-nav-links.develop%</a><i>・</i><a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on <i class="fa fa-twitter"></i></a>
+	<style>
+		:scope
+			display inline
+	</style>
+</mk-nav-links>
diff --git a/src/web/app/desktop/assets/index.jpg b/src/web/app/desktop/assets/index.jpg
new file mode 100644
index 0000000000..10c412efe2
--- /dev/null
+++ b/src/web/app/desktop/assets/index.jpg
diff --git a/src/web/app/desktop/tags/home-widgets/nav.tag b/src/web/app/desktop/tags/home-widgets/nav.tag
index f179005734..61c0b4cb55 100644
--- a/src/web/app/desktop/tags/home-widgets/nav.tag
+++ b/src/web/app/desktop/tags/home-widgets/nav.tag
@@ -1,4 +1,5 @@
-<mk-nav-home-widget><a href={ CONFIG.aboutUrl }>%i18n:desktop.tags.mk-nav-home-widget.about%</a><i>・</i><a href={ CONFIG.statsUrl }>%i18n:desktop.tags.mk-nav-home-widget.stats%</a><i>・</i><a href={ CONFIG.statusUrl }>%i18n:desktop.tags.mk-nav-home-widget.status%</a><i>・</i><a href="http://zawazawa.jp/misskey/">%i18n:desktop.tags.mk-nav-home-widget.wiki%</a><i>・</i><a href="https://github.com/syuilo/misskey/blob/master/DONORS.md">%i18n:desktop.tags.mk-nav-home-widget.donors%</a><i>・</i><a href="https://github.com/syuilo/misskey">%i18n:desktop.tags.mk-nav-home-widget.repository%</a><i>・</i><a href={ CONFIG.devUrl }>%i18n:desktop.tags.mk-nav-home-widget.develop%</a><i>・</i><a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on <i class="fa fa-twitter"></i></a>
+<mk-nav-home-widget>
+	<mk-nav-links/>
 	<style>
 		:scope
 			display block
diff --git a/src/web/app/desktop/tags/index.ts b/src/web/app/desktop/tags/index.ts
index fa6b2f6dd4..3ec1d108aa 100644
--- a/src/web/app/desktop/tags/index.ts
+++ b/src/web/app/desktop/tags/index.ts
@@ -56,8 +56,6 @@ require('./user-timeline.tag');
 require('./user.tag');
 require('./big-follow-button.tag');
 require('./pages/entrance.tag');
-require('./pages/entrance/signin.tag');
-require('./pages/entrance/signup.tag');
 require('./pages/home.tag');
 require('./pages/home-customize.tag');
 require('./pages/user.tag');
diff --git a/src/web/app/desktop/tags/pages/entrance.tag b/src/web/app/desktop/tags/pages/entrance.tag
index 7ad19c073e..914e6b0d58 100644
--- a/src/web/app/desktop/tags/pages/entrance.tag
+++ b/src/web/app/desktop/tags/pages/entrance.tag
@@ -1,16 +1,25 @@
 <mk-entrance>
 	<main>
-		<img src="/assets/title.svg" alt="Misskey"/>
-		<mk-entrance-signin if={ mode == 'signin' }/>
-		<mk-entrance-signup if={ mode == 'signup' }/>
-		<div class="introduction" if={ mode == 'introduction' }>
-			<mk-introduction/>
-			<button onclick={ signin }>わかった</button>
+		<div>
+			<h1>どこにいても、ここにあります</h1>
+			<p>ようこそ！ MisskeyはTwitter風ミニブログSNSです――思ったこと、共有したいことをシンプルに書き残せます。タイムラインを見れば、皆の反応や皆がどう思っているのかもすぐにわかります。</p>
+			<p if={ stats }>これまでに{ stats.posts_count }投稿されました</p>
+		</div>
+		<div>
+			<mk-entrance-signin if={ mode == 'signin' }/>
+			<mk-entrance-signup if={ mode == 'signup' }/>
+			<div class="introduction" if={ mode == 'introduction' }>
+				<mk-introduction/>
+				<button onclick={ signin }>わかった</button>
+			</div>
 		</div>
 	</main>
 	<mk-forkit/>
 	<footer>
-		<mk-copyright/>
+		<div>
+			<mk-nav-links/>
+			<mk-copyright/>
+		</div>
 	</footer>
 	<!-- ↓ https://github.com/riot/riot/issues/2134 (将来的)-->
 	<style data-disable-scope="data-disable-scope">
@@ -21,66 +30,100 @@
 	</style>
 	<style>
 		:scope
+			$width = 1000px
+
 			display block
-			height 100%
+
+			&:before
+				content ""
+				display block
+				position fixed
+				width 100%
+				height 100%
+				background rgba(0, 0, 0, 0.3)
 
 			> main
 				display block
+				max-width $width
+				margin 0 auto
+				padding 64px 0 0 0
 				padding-bottom 16px
 
-				> img
+				&:after
+					content ""
 					display block
-					width 160px
-					height 170px
-					margin 0 auto
-					pointer-events none
-					user-select none
+					clear both
 
-				> .introduction
-					max-width 360px
-					margin 0 auto
-					color #777
+				> div:first-child
+					position absolute
+					top 64px
+					left 0
+					width calc(100% - 500px)
+					color #fff
+					text-shadow 0 0 32px rgba(0, 0, 0, 0.5)
+					font-weight bold
 
-					> mk-introduction
-						padding 32px
-						background #fff
-						box-shadow 0 4px 16px rgba(0, 0, 0, 0.2)
+					> p:last-child
+						padding 1em 0 0 0
+						border-top solid 1px #fff
 
-					> button
-						display block
-						margin 16px auto 0 auto
-						color #666
+				> div:last-child
+					float right
 
-						&:hover
-							text-decoration underline
+					> .introduction
+						max-width 360px
+						margin 0 auto
+						color #777
 
-			> .tl
-				padding 32px 0
-				background #fff
+						> mk-introduction
+							padding 32px
+							background #fff
+							box-shadow 0 4px 16px rgba(0, 0, 0, 0.2)
 
-				> h2
-					display block
-					margin 0
-					padding 0
-					text-align center
-					font-size 20px
-					color #5b6b73
+						> button
+							display block
+							margin 16px auto 0 auto
+							color #666
+
+							&:hover
+								text-decoration underline
 
-				> mk-public-timeline
-					max-width 500px
-					margin 0 auto
 			> footer
-				> mk-copyright
-					margin 0
+				*
+					color #fff !important
+					text-shadow 0 0 8px #000
+					font-weight bold
+
+				> div
+					max-width $width
+					margin 0 auto
+					padding 16px 0
 					text-align center
-					line-height 64px
-					font-size 10px
-					color rgba(#000, 0.5)
+					border-top solid 1px #fff
+
+					> mk-copyright
+						margin 0
+						line-height 64px
+						font-size 10px
 
 	</style>
 	<script>
+		this.mixin('api');
+
 		this.mode = 'signin';
 
+		this.on('mount', () => {
+			document.documentElement.style.backgroundImage = 'url("/assets/desktop/index.jpg")';
+			document.documentElement.style.backgroundSize = 'cover';
+			document.documentElement.style.backgroundPosition = 'center';
+
+			this.api('stats').then(stats => {
+				this.update({
+					stats
+				});
+			});
+		});
+
 		this.signup = () => {
 			this.update({
 				mode: 'signup'
@@ -100,3 +143,194 @@
 		};
 	</script>
 </mk-entrance>
+
+<mk-entrance-signin>
+	<a class="help" href={ CONFIG.aboutUrl + '/help' } title="お困りですか？"><i class="fa fa-question"></i></a>
+	<div class="form">
+		<h1><img if={ user } src={ user.avatar_url + '?thumbnail&size=32' }/>
+			<p>{ user ? user.name : 'アカウント' }</p>
+		</h1>
+		<mk-signin ref="signin"/>
+	</div>
+	<div class="divider"><span>or</span></div>
+	<button class="signup" onclick={ parent.signup }>新規登録</button><a class="introduction" onclick={ introduction }>Misskeyについて</a>
+	<style>
+		:scope
+			display block
+			width 290px
+			margin 0 auto
+			text-align center
+
+			&:hover
+				> .help
+					opacity 1
+
+			> .help
+				cursor pointer
+				display block
+				position absolute
+				top 0
+				right 0
+				z-index 1
+				margin 0
+				padding 0
+				font-size 1.2em
+				color #999
+				border none
+				outline none
+				background transparent
+				opacity 0
+				transition opacity 0.1s ease
+
+				&:hover
+					color #444
+
+				&:active
+					color #222
+
+				> i
+					padding 14px
+
+			> .form
+				padding 10px 28px 16px 28px
+				background #fff
+				box-shadow 0px 4px 16px rgba(0, 0, 0, 0.2)
+
+				> h1
+					display block
+					margin 0
+					padding 0
+					height 54px
+					line-height 54px
+					text-align center
+					text-transform uppercase
+					font-size 1em
+					font-weight bold
+					color rgba(0, 0, 0, 0.5)
+					border-bottom solid 1px rgba(0, 0, 0, 0.1)
+
+					> p
+						display inline
+						margin 0
+						padding 0
+
+					> img
+						display inline-block
+						top 10px
+						width 32px
+						height 32px
+						margin-right 8px
+						border-radius 100%
+
+						&[src='']
+							display none
+
+			> .divider
+				padding 16px 0
+				text-align center
+
+				&:before
+				&:after
+					content ""
+					display block
+					position absolute
+					top 50%
+					width 45%
+					height 1px
+					border-top solid 1px rgba(0, 0, 0, 0.1)
+
+				&:before
+					left 0
+
+				&:after
+					right 0
+
+				> *
+					z-index 1
+					padding 0 8px
+					color #fff
+					text-shadow 0 0 8px rgba(0, 0, 0, 0.5)
+
+			> .signup
+				width 100%
+				line-height 56px
+				font-size 1em
+				color #fff
+				background $theme-color
+				border-radius 64px
+
+				&:hover
+					background lighten($theme-color, 5%)
+
+				&:active
+					background darken($theme-color, 5%)
+
+			> .introduction
+				display inline-block
+				margin-top 16px
+				font-size 12px
+				color #666
+
+	</style>
+	<script>
+		this.on('mount', () => {
+			this.refs.signin.on('user', user => {
+				this.update({
+					user: user
+				});
+			});
+		});
+
+		this.introduction = () => {
+			this.parent.introduction();
+		};
+	</script>
+</mk-entrance-signin>
+
+<mk-entrance-signup>
+	<mk-signup/>
+	<button class="cancel" type="button" onclick={ parent.signin } title="キャンセル"><i class="fa fa-times"></i></button>
+	<style>
+		:scope
+			display block
+			width 368px
+			margin 0 auto
+
+			&:hover
+				> .cancel
+					opacity 1
+
+			> mk-signup
+				padding 18px 32px 0 32px
+				background #fff
+				box-shadow 0px 4px 16px rgba(0, 0, 0, 0.2)
+
+			> .cancel
+				cursor pointer
+				display block
+				position absolute
+				top 0
+				right 0
+				z-index 1
+				margin 0
+				padding 0
+				font-size 1.2em
+				color #999
+				border none
+				outline none
+				box-shadow none
+				background transparent
+				opacity 0
+				transition opacity 0.1s ease
+
+				&:hover
+					color #555
+
+				&:active
+					color #222
+
+				> i
+					padding 14px
+
+	</style>
+</mk-entrance-signup>
diff --git a/src/web/app/desktop/tags/pages/entrance/signin.tag b/src/web/app/desktop/tags/pages/entrance/signin.tag
deleted file mode 100644
index 0b33412496..0000000000
--- a/src/web/app/desktop/tags/pages/entrance/signin.tag
+++ /dev/null
@@ -1,134 +0,0 @@
-<mk-entrance-signin><a class="help" href={ CONFIG.aboutUrl + '/help' } title="お困りですか？"><i class="fa fa-question"></i></a>
-	<div class="form">
-		<h1><img if={ user } src={ user.avatar_url + '?thumbnail&size=32' }/>
-			<p>{ user ? user.name : 'アカウント' }</p>
-		</h1>
-		<mk-signin ref="signin"/>
-	</div>
-	<div class="divider"><span>or</span></div>
-	<button class="signup" onclick={ parent.signup }>新規登録</button><a class="introduction" onclick={ introduction }>Misskeyについて</a>
-	<style>
-		:scope
-			display block
-			width 290px
-			margin 0 auto
-			text-align center
-
-			&:hover
-				> .help
-					opacity 1
-
-			> .help
-				cursor pointer
-				display block
-				position absolute
-				top 0
-				right 0
-				z-index 1
-				margin 0
-				padding 0
-				font-size 1.2em
-				color #999
-				border none
-				outline none
-				background transparent
-				opacity 0
-				transition opacity 0.1s ease
-
-				&:hover
-					color #444
-
-				&:active
-					color #222
-
-				> i
-					padding 14px
-
-			> .form
-				padding 10px 28px 16px 28px
-				background #fff
-				box-shadow 0px 4px 16px rgba(0, 0, 0, 0.2)
-
-				> h1
-					display block
-					margin 0
-					padding 0
-					height 54px
-					line-height 54px
-					text-align center
-					text-transform uppercase
-					font-size 1em
-					font-weight bold
-					color rgba(0, 0, 0, 0.5)
-					border-bottom solid 1px rgba(0, 0, 0, 0.1)
-
-					> p
-						display inline
-						margin 0
-						padding 0
-
-					> img
-						display inline-block
-						top 10px
-						width 32px
-						height 32px
-						margin-right 8px
-						border-radius 100%
-
-						&[src='']
-							display none
-
-			> .divider
-				padding 16px 0
-				text-align center
-
-				&:after
-					content ""
-					display block
-					position absolute
-					top 50%
-					width 100%
-					height 1px
-					border-top solid 1px rgba(0, 0, 0, 0.1)
-
-				> *
-					z-index 1
-					padding 0 8px
-					color rgba(0, 0, 0, 0.5)
-					background #f7f7f7
-
-			> .signup
-				width 100%
-				line-height 56px
-				font-size 1em
-				color #fff
-				background $theme-color
-				border-radius 64px
-
-				&:hover
-					background lighten($theme-color, 5%)
-
-				&:active
-					background darken($theme-color, 5%)
-
-			> .introduction
-				display inline-block
-				margin-top 16px
-				font-size 12px
-				color #666
-
-	</style>
-	<script>
-		this.on('mount', () => {
-			this.refs.signin.on('user', user => {
-				this.update({
-					user: user
-				});
-			});
-		});
-
-		this.introduction = () => {
-			this.parent.introduction();
-		};
-	</script>
-</mk-entrance-signin>
diff --git a/src/web/app/desktop/tags/pages/entrance/signup.tag b/src/web/app/desktop/tags/pages/entrance/signup.tag
deleted file mode 100644
index 0722d82a65..0000000000
--- a/src/web/app/desktop/tags/pages/entrance/signup.tag
+++ /dev/null
@@ -1,47 +0,0 @@
-<mk-entrance-signup>
-	<mk-signup/>
-	<button class="cancel" type="button" onclick={ parent.signin } title="キャンセル"><i class="fa fa-times"></i></button>
-	<style>
-		:scope
-			display block
-			width 368px
-			margin 0 auto
-
-			&:hover
-				> .cancel
-					opacity 1
-
-			> mk-signup
-				padding 18px 32px 0 32px
-				background #fff
-				box-shadow 0px 4px 16px rgba(0, 0, 0, 0.2)
-
-			> .cancel
-				cursor pointer
-				display block
-				position absolute
-				top 0
-				right 0
-				z-index 1
-				margin 0
-				padding 0
-				font-size 1.2em
-				color #999
-				border none
-				outline none
-				box-shadow none
-				background transparent
-				opacity 0
-				transition opacity 0.1s ease
-
-				&:hover
-					color #555
-
-				&:active
-					color #222
-
-				> i
-					padding 14px
-
-	</style>
-</mk-entrance-signup>
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index f01d2a039b..d944bb33a7 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -610,6 +610,7 @@
 		<mk-user-profile user={ user }/>
 		<mk-user-photos user={ user }/>
 		<mk-user-followers-you-know if={ SIGNIN && I.id !== user.id } user={ user }/>
+		<p>%i18n:desktop.tags.mk-user.last-used-at%: <b><mk-time time={ user.last_used_at }/></b></p>
 	</div>
 	<main>
 		<mk-post-detail if={ user.pinned_post } post={ user.pinned_post } compact={ true }/>
@@ -619,6 +620,7 @@
 		<mk-calendar-widget warp={ warp } start={ new Date(user.created_at) }/>
 		<mk-activity-widget user={ user }/>
 		<mk-user-frequently-replied-users user={ user }/>
+		<div class="nav"><mk-nav-links/></div>
 	</div>
 	<style>
 		:scope
@@ -646,9 +648,31 @@
 				&:first-child
 					padding 16px 0 16px 16px
 
+					> p
+						display block
+						margin 0
+						padding 0 12px
+						text-align center
+						font-size 0.8em
+						color #aaa
+
 				&:last-child
 					padding 16px 16px 16px 0
 
+					> .nav
+						padding 16px
+						font-size 12px
+						color #aaa
+						background #fff
+						border solid 1px rgba(0, 0, 0, 0.075)
+						border-radius 6px
+
+						a
+							color #999
+
+						i
+							color #ccc
+
 	</style>
 	<script>
 		this.mixin('i');