v2493

CHANGELOG.md

@@ -2,6 +2,10 @@ ChangeLog (Release Notes)
 =========================
 主に notable な changes を書いていきます
 
+2493 (2017/08/29)
+-----------------
+* デザインの変更など
+
 2491 (2017/08/29)
 -----------------
 * デザインの修正と調整

locales/en.yml

@@ -355,7 +355,9 @@ mobile:
       notifications: "Notifications"
 
     mk-post-page:
-      submit: "Post"
+      title: "Post"
+      prev: "Previous post"
+      next: "Next post"
 
     mk-search-page:
       search: "Search"

locales/ja.yml

@@ -355,7 +355,9 @@ mobile:
       notifications: "通知"
 
     mk-post-page:
-      submit: "投稿"
+      title: "投稿"
+      prev: "前の投稿"
+      next: "次の投稿"
 
     mk-search-page:
       search: "検索"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "misskey",
   "author": "syuilo <i@syuilo.com>",
-  "version": "0.0.2491",
+  "version": "0.0.2493",
   "license": "MIT",
   "description": "A miniblog-based SNS",
   "bugs": "https://github.com/syuilo/misskey/issues",

src/web/app/common/tags/activity-table.tag

@@ -17,7 +17,6 @@
 			display block
 			max-width 600px
 			margin 0 auto
-			background #fff
 
 			> svg
 				display block

src/web/app/mobile/tags/home-timeline.tag

@@ -6,7 +6,7 @@
 			display block
 
 			> mk-init-following
-				border-bottom solid 1px #eee
+				margin-bottom 8px
 
 	</style>
 	<script>

src/web/app/mobile/tags/home.tag

@@ -7,6 +7,7 @@
 			> mk-home-timeline
 				max-width 600px
 				margin 0 auto
+				padding 8px
 
 			@media (min-width 500px)
 				padding 16px

src/web/app/mobile/tags/init-following.tag

@@ -1,10 +1,14 @@
 <mk-init-following>
 	<p class="title">気になるユーザーをフォロー:</p>
 	<div class="users" if={ !fetching && users.length > 0 }>
-		<div class="user" each={ users }><a class="avatar-anchor" href={ '/' + username }><img class="avatar" src={ avatar_url + '?thumbnail&size=42' } alt=""/></a>
+		<div class="user" each={ users }>
-			<div class="body"><a class="name" href={ '/' + username } target="_blank">{ name }</a>
+			<header style={ banner_url ? 'background-image: url(' + banner_url + '?thumbnail&size=1024)' : '' }>
+				<a href={ '/' + username }>
+					<img src={ avatar_url + '?thumbnail&size=200' } alt="avatar"/>
+				</a>
+			</header>
+			<a class="name" href={ '/' + username } target="_blank">{ name }</a>
 			<p class="username">@{ username }</p>
-			</div>
 			<mk-follow-button user={ this }/>
 		</div>
 	</div>
@@ -15,63 +19,65 @@
 	<style>
 		:scope
 			display block
-			padding 16px
+			background #fff
+			border-radius 8px
+			box-shadow 0 0 0 1px rgba(0, 0, 0, 0.2)
 
 			> .title
-				margin 0 0 12px 0
+				margin 0
+				padding 8px 16px
 				font-size 1em
 				font-weight bold
 				color #888
 
 			> .users
-				&:after
+				overflow-x scroll
-					content ""
+				white-space nowrap
-					display block
+				padding 16px
-					clear both
+				background #eee
 
 				> .user
-					padding 16px
+					display inline-block
-					width 238px
+					width 200px
-					float left
+					text-align center
-
-					&:after
-						content ""
-						display block
-						clear both
-
-					> .avatar-anchor
-						display block
-						float left
-						margin 0 12px 0 0
-
-						> .avatar
-							display block
-							width 42px
-							height 42px
-							margin 0
 					border-radius 8px
-							vertical-align bottom
+					background #fff
 
-					> .body
+					&:not(:last-child)
-						float left
+						margin-right 16px
-						width calc(100% - 54px)
+
+					> header
+						display block
+						height 80px
+						background-color #ddd
+						background-size cover
+						background-position center
+						border-radius 8px 8px 0 0
+
+						> a
+							> img
+								position absolute
+								top 20px
+								left calc(50% - 40px)
+								width 80px
+								height 80px
+								border solid 2px #fff
+								border-radius 8px
 
 					> .name
-							margin 0
+						display block
+						margin 24px 0 2px 0
 						font-size 16px
-							line-height 24px
 						color #555
 
 					> .username
 						margin 0
 						font-size 15px
-							line-height 16px
 						color #ccc
 
 					> mk-follow-button
-						position absolute
+						display inline-block
-						top 16px
+						margin 8px 0 16px 0
-						right 16px
 
 			> .empty
 				margin 0
@@ -90,7 +96,8 @@
 
 			> .refresh
 				display block
-				margin 0 8px 0 0
+				margin 0
+				padding 8px 16px
 				text-align right
 				font-size 0.9em
 				color #999
@@ -117,7 +124,7 @@
 					color #222
 
 				> i
-					padding 14px
+					padding 10px
 
 	</style>
 	<script>

src/web/app/mobile/tags/notifications.tag

@@ -1,9 +1,7 @@
 <mk-notifications>
 	<div class="notifications" if={ notifications.length != 0 }>
 		<virtual each={ notification, i in notifications }>
-			<div>
 			<mk-notification notification={ notification }/>
-			</div>
 			<p class="date" if={ i != notifications.length - 1 && notification._date != notifications[i + 1]._date }><span><i class="fa fa-angle-up"></i>{ notification._datetext }</span><span><i class="fa fa-angle-down"></i>{ notifications[i + 1]._datetext }</span></p>
 		</virtual>
 	</div>
@@ -15,19 +13,27 @@
 	<style>
 		:scope
 			display block
+			margin 8px auto
+			padding 0
+			max-width 500px
+			width calc(100% - 16px)
 			background #fff
+			border-radius 8px
+			box-shadow 0 0 0 1px rgba(0, 0, 0, 0.2)
+
+			@media (min-width 500px)
+				margin 16px auto
+				width calc(100% - 32px)
 
 			> .notifications
 
-				> div
-					border-bottom solid 1px rgba(0, 0, 0, 0.05)
-
-					&:last-child
-						border-bottom none
-
 				> mk-notification
 					margin 0 auto
 					max-width 500px
+					border-bottom solid 1px rgba(0, 0, 0, 0.05)
+
+					&:last-child
+						border-bottom none
 
 				> .date
 					display block

src/web/app/mobile/tags/page/home.tag

@@ -20,6 +20,7 @@
 		this.on('mount', () => {
 			document.title = 'Misskey'
 			ui.trigger('title', '<i class="fa fa-home"></i>%i18n:mobile.tags.mk-home.home%');
+			document.documentElement.style.background = '#313a42';
 
 			ui.trigger('func', () => {
 				openPostForm();

src/web/app/mobile/tags/page/notifications.tag

@@ -13,6 +13,7 @@
 		this.on('mount', () => {
 			document.title = 'Misskey | %i18n:mobile.tags.mk-notifications-page.notifications%';
 			ui.trigger('title', '<i class="fa fa-bell-o"></i>%i18n:mobile.tags.mk-notifications-page.notifications%');
+			document.documentElement.style.background = '#313a42';
 
 			Progress.start();
 

src/web/app/mobile/tags/page/post.tag

@@ -1,7 +1,9 @@
 <mk-post-page>
 	<mk-ui ref="ui">
-		<main>
+		<main if={ !parent.fetching }>
+			<a if={ parent.post.next } href={ parent.post.next }><i class="fa fa-angle-up"></i>%i18n:mobile.tags.mk-post-page.next%</a>
 			<mk-post-detail ref="post" post={ parent.post }/>
+			<a if={ parent.post.prev } href={ parent.post.prev }><i class="fa fa-angle-down"></i>%i18n:mobile.tags.mk-post-page.prev%</a>
 		</main>
 	</mk-ui>
 	<style>
@@ -9,31 +11,51 @@
 			display block
 
 			main
-				background #fff
+				text-align center
 
-				> mk-post-detail
+				> a
-					width 100%
+					display inline-block
-					max-width 500px
-					margin 0 auto
 
+					&:first-child
+						margin-top 8px
+
+						@media (min-width 500px)
+							margin-top 16px
+
+					&:last-child
+						margin-bottom 8px
+
+						@media (min-width 500px)
+							margin-bottom 16px
+
+					> i
+						margin-right 4px
 	</style>
 	<script>
 		import ui from '../../scripts/ui-event';
 		import Progress from '../../../common/scripts/loading';
 
-		this.post = this.opts.post;
+		this.mixin('api');
+
+		this.fetching = true;
+		this.post = null;
 
 		this.on('mount', () => {
 			document.title = 'Misskey';
-			ui.trigger('title', '<i class="fa fa-sticky-note-o"></i>%i18n:mobile.tags.mk-post-page.submit%');
+			ui.trigger('title', '<i class="fa fa-sticky-note-o"></i>%i18n:mobile.tags.mk-post-page.title%');
+			document.documentElement.style.background = '#313a42';
 
 			Progress.start();
 
-			this.refs.ui.refs.post.on('post-fetched', () => {
+			this.api('posts/show', {
-				Progress.set(0.5);
+				post_id: this.opts.post
+			}).then(post => {
+
+				this.update({
+					fetching: false,
+					post: post
 				});
 
-			this.refs.ui.refs.post.on('loaded', () => {
 				Progress.done();
 			});
 		});

src/web/app/mobile/tags/page/search.tag

@@ -14,6 +14,7 @@
 			document.title = `%i18n:mobile.tags.mk-search-page.search%: ${this.opts.query} | Misskey`
 			// TODO: クエリをHTMLエスケープ
 			ui.trigger('title', '<i class="fa fa-search"></i>' + this.opts.query);
+			document.documentElement.style.background = '#313a42';
 
 			Progress.start();
 

src/web/app/mobile/tags/page/settings/profile.tag

@@ -56,8 +56,12 @@
 			display block
 
 			> div
-				margin 16px auto
+				margin 8px auto
 				max-width 500px
+				width calc(100% - 16px)
+
+				@media (min-width 500px)
+					margin 16px auto
 					width calc(100% - 32px)
 
 				> p
@@ -66,9 +70,10 @@
 					padding 12px 16px
 					font-size 14px
 					color #79d4e6
+					border solid 1px #71afbb
 					//color #276f86
 					//background #f8ffff
-					border solid 1px #a9d5de
+					//border solid 1px #a9d5de
 					border-radius 8px
 
 					> i

src/web/app/mobile/tags/page/user-followers.tag

@@ -29,6 +29,7 @@
 				document.title = '%i18n:mobile.tags.mk-user-followers-page.followers-of%'.replace('{}', user.name) + ' | Misskey';
 				// TODO: ユーザー名をエスケープ
 				ui.trigger('title', '<img src="' + user.avatar_url + '?thumbnail&size=64">' +  '%i18n:mobile.tags.mk-user-followers-page.followers-of%'.replace('{}', user.name));
+				document.documentElement.style.background = '#313a42';
 
 				this.refs.ui.refs.list.on('loaded', () => {
 					Progress.done();

src/web/app/mobile/tags/page/user-following.tag

@@ -29,6 +29,7 @@
 				document.title = '%i18n:mobile.tags.mk-user-following-page.following-of%'.replace('{}', user.name) + ' | Misskey';
 				// TODO: ユーザー名をエスケープ
 				ui.trigger('title', '<img src="' + user.avatar_url + '?thumbnail&size=64">' + '%i18n:mobile.tags.mk-user-following-page.following-of%'.replace('{}', user.name));
+				document.documentElement.style.background = '#313a42';
 
 				this.refs.ui.refs.list.on('loaded', () => {
 					Progress.done();

src/web/app/mobile/tags/page/user.tag

@@ -13,6 +13,7 @@
 		this.user = this.opts.user;
 
 		this.on('mount', () => {
+			document.documentElement.style.background = '#313a42';
 			Progress.start();
 
 			this.refs.ui.refs.user.on('loaded', user => {

src/web/app/mobile/tags/post-detail.tag

@@ -1,19 +1,15 @@
 <mk-post-detail>
-	<div class="fetching" if={ fetching }>
-		<mk-ellipsis-icon/>
-	</div>
-	<div class="main" if={ !fetching }>
 	<button class="read-more" if={ p.reply_to && p.reply_to.reply_to_id && context == null } onclick={ loadContext } disabled={ loadingContext }>
 		<i class="fa fa-ellipsis-v" if={ !contextFetching }></i>
 		<i class="fa fa-spinner fa-pulse" if={ contextFetching }></i>
 	</button>
 	<div class="context">
 		<virtual each={ post in context }>
-				<mk-post-preview post={ post }/>
+			<mk-post-detail-sub post={ post }/>
 		</virtual>
 	</div>
 	<div class="reply-to" if={ p.reply_to }>
-			<mk-post-preview post={ p.reply_to }/>
+		<mk-post-detail-sub post={ p.reply_to }/>
 	</div>
 	<div class="repost" if={ isRepost }>
 		<p>
@@ -61,21 +57,29 @@
 	</article>
 	<div class="replies">
 		<virtual each={ post in replies }>
-				<mk-post-preview post={ post }/>
+			<mk-post-detail-sub post={ post }/>
 		</virtual>
 	</div>
-	</div>
 	<style>
 		:scope
 			display block
-			margin 0
+			overflow hidden
+			margin 8px auto
 			padding 0
+			max-width 500px
+			width calc(100% - 16px)
+			text-align left
+			background #fff
+			border-radius 8px
+			box-shadow 0 0 0 1px rgba(0, 0, 0, 0.2)
+
+			@media (min-width 500px)
+				margin 16px auto
+				width calc(100% - 32px)
 
 			> .fetching
 				padding 64px 0
 
-			> .main
-
 			> .read-more
 				display block
 				margin 0
@@ -265,29 +269,16 @@
 
 		this.mixin('api');
 
-		this.fetching = true;
+		this.post = this.opts.post;
+		this.isRepost = this.post.repost != null;
+		this.p = this.isRepost ? this.post.repost : this.post;
+		this.p.reactions_count = this.p.reaction_counts ? Object.keys(this.p.reaction_counts).map(key => this.p.reaction_counts[key]).reduce((a, b) => a + b) : 0;
+		this.summary = getPostSummary(this.p);
+
 		this.loadingContext = false;
 		this.context = null;
-		this.post = null;
 
 		this.on('mount', () => {
-			this.api('posts/show', {
-				post_id: this.opts.post
-			}).then(post => {
-				const isRepost = post.repost != null;
-				const p = isRepost ? post.repost : post;
-				p.reactions_count = p.reaction_counts ? Object.keys(p.reaction_counts).map(key => p.reaction_counts[key]).reduce((a, b) => a + b) : 0;
-
-				this.update({
-					fetching: false,
-					post: post,
-					isRepost: isRepost,
-					p: p,
-					summary: getPostSummary(p)
-				});
-
-				this.trigger('loaded');
-
 			if (this.p.text) {
 				const tokens = this.p.ast;
 
@@ -317,7 +308,6 @@
 				});
 			});
 		});
-		});
 
 		this.reply = () => {
 			openPostForm({
@@ -357,3 +347,101 @@
 		};
 	</script>
 </mk-post-detail>
+
+<mk-post-detail-sub>
+	<article>
+		<a class="avatar-anchor" href={ '/' + post.user.username }>
+			<img class="avatar" src={ post.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/>
+		</a>
+		<div class="main">
+			<header>
+				<a class="name" href={ '/' + post.user.username }>{ post.user.name }</a>
+				<span class="username">@{ post.user.username }</span>
+				<a class="time" href={ '/' + post.user.username + '/' + post.id }>
+					<mk-time time={ post.created_at }/>
+				</a>
+			</header>
+			<div class="body">
+				<mk-sub-post-content class="text" post={ post }/>
+			</div>
+		</div>
+	</article>
+	<style>
+		:scope
+			display block
+			margin 0
+			padding 8px
+			font-size 0.9em
+			background #fdfdfd
+
+			@media (min-width 500px)
+				padding 12px
+
+			> article
+				&:after
+					content ""
+					display block
+					clear both
+
+				&:hover
+					> .main > footer > button
+						color #888
+
+				> .avatar-anchor
+					display block
+					float left
+					margin 0 12px 0 0
+
+					> .avatar
+						display block
+						width 48px
+						height 48px
+						margin 0
+						border-radius 8px
+						vertical-align bottom
+
+				> .main
+					float left
+					width calc(100% - 60px)
+
+					> header
+						display flex
+						margin-bottom 4px
+						white-space nowrap
+
+						> .name
+							display block
+							margin 0 .5em 0 0
+							padding 0
+							overflow hidden
+							color #607073
+							font-size 1em
+							font-weight 700
+							text-align left
+							text-decoration none
+							text-overflow ellipsis
+
+							&:hover
+								text-decoration underline
+
+						> .username
+							text-align left
+							margin 0 .5em 0 0
+							color #d1d8da
+
+						> .time
+							margin-left auto
+							color #b2b8bb
+
+					> .body
+
+						> .text
+							cursor default
+							margin 0
+							padding 0
+							font-size 1.1em
+							color #717171
+
+	</style>
+	<script>this.post = this.opts.post</script>
+</mk-post-detail-sub>

src/web/app/mobile/tags/post-form.tag

@@ -1,12 +1,10 @@
 <mk-post-form>
 	<header>
-		<div>
 		<button class="cancel" onclick={ cancel }><i class="fa fa-times"></i></button>
 		<div>
 			<span if={ refs.text } class="text-count { over: refs.text.value.length > 1000 }">{ 1000 - refs.text.value.length }</span>
 			<button class="submit" onclick={ post }>%i18n:mobile.tags.mk-post-form.submit%</button>
 		</div>
-		</div>
 	</header>
 	<div class="form">
 		<mk-post-preview if={ opts.reply } post={ opts.reply }/>
@@ -30,20 +28,21 @@
 	<style>
 		:scope
 			display block
-			padding-top 50px
+			max-width 500px
+			width calc(100% - 16px)
+			margin 8px auto
+			background #fff
+			border-radius 8px
+			box-shadow 0 0 0 1px rgba(0, 0, 0, 0.2)
+
+			@media (min-width 500px)
+				margin 16px auto
+				width calc(100% - 32px)
 
 			> header
-				position fixed
+				z-index 1
-				z-index 1000
-				top 0
-				left 0
-				width 100%
 				height 50px
-				background #fff
+				box-shadow 0 1px 0 0 rgba(0, 0, 0, 0.1)
-
-				> div
-					max-width 500px
-					margin 0 auto
 
 				> .cancel
 					width 50px

src/web/app/mobile/tags/search-posts.tag

@@ -3,8 +3,16 @@
 	<style>
 		:scope
 			display block
+			margin 8px auto
+			max-width 500px
+			width calc(100% - 16px)
 			background #fff
+			border-radius 8px
+			box-shadow 0 0 0 1px rgba(0, 0, 0, 0.2)
 
+			@media (min-width 500px)
+				margin 16px auto
+				width calc(100% - 32px)
 	</style>
 	<script>
 		this.mixin('api');

src/web/app/mobile/tags/timeline.tag

@@ -22,6 +22,8 @@
 		:scope
 			display block
 			background #fff
+			border-radius 8px
+			box-shadow 0 0 0 1px rgba(0, 0, 0, 0.2)
 
 			> .init
 				padding 64px 0
@@ -47,6 +49,9 @@
 			> mk-timeline-post
 				border-bottom solid 1px #eaeaea
 
+				&:first-child
+					border-radius 8px 8px 0 0
+
 				&:last-of-type
 					border-bottom none
 
@@ -77,6 +82,7 @@
 					padding 16px
 					width 100%
 					color $theme-color
+					border-radius 0 0 8px 8px
 
 					&:disabled
 						opacity 0.7

src/web/app/mobile/tags/user-timeline.tag

@@ -5,8 +5,6 @@
 			display block
 			max-width 600px
 			margin 0 auto
-			background #fff
-
 	</style>
 	<script>
 		this.mixin('api');

src/web/app/mobile/tags/user.tag

@@ -57,7 +57,7 @@
 				> header
 					> .banner
 						padding-bottom 33.3%
-						background-color #f5f5f5
+						background-color #1b1b1b
 						background-size cover
 						background-position center
 
@@ -84,13 +84,13 @@
 									left -2px
 									bottom -2px
 									width 100%
-									border 2px solid #fff
+									border 2px solid #313a42
 									border-radius 6px
 
 									@media (min-width 500px)
 										left -4px
 										bottom -4px
-										border 4px solid #fff
+										border 4px solid #313a42
 										border-radius 12px
 
 							> mk-follow-button
@@ -104,7 +104,7 @@
 								margin 0
 								line-height 22px
 								font-size 20px
-								color #222
+								color #fff
 
 							> .username
 								display inline-block
@@ -131,7 +131,7 @@
 							> p
 								display inline
 								margin 0 16px 0 0
-								color #555
+								color #a9b9c1
 
 								> i
 									margin-right 4px
@@ -146,7 +146,7 @@
 								> b
 									margin-right 4px
 									font-size 16px
-									color #14171a
+									color #fff
 
 								> i
 									font-size 14px
@@ -159,7 +159,7 @@
 						justify-content center
 						margin 0 auto
 						max-width 600px
-						border-bottom solid 1px #ddd
+						border-bottom solid 1px rgba(0, 0, 0, 0.2)
 
 						> a
 							display block
@@ -177,8 +177,10 @@
 								border-color $theme-color
 
 				> .body
+					padding 8px
+
 					@media (min-width 500px)
-						padding 16px 0 0 0
+						padding 16px
 
 	</style>
 	<script>

src/web/app/mobile/tags/users-list.tag

@@ -14,14 +14,13 @@
 	<style>
 		:scope
 			display block
-			background #fff
 
 			> nav
 				display flex
 				justify-content center
 				margin 0 auto
 				max-width 600px
-				border-bottom solid 1px #ddd
+				border-bottom solid 1px rgba(0, 0, 0, 0.2)
 
 				> span
 					display block
@@ -43,14 +42,23 @@
 						padding 2px 5px
 						font-size 12px
 						line-height 1
-						color #888
+						color #fff
-						background #eee
+						background rgba(0, 0, 0, 0.3)
 						border-radius 20px
 
 			> .users
+				margin 8px auto
+				max-width 500px
+				width calc(100% - 16px)
+				background #fff
+				border-radius 8px
+				box-shadow 0 0 0 1px rgba(0, 0, 0, 0.2)
+
+				@media (min-width 500px)
+					margin 16px auto
+					width calc(100% - 32px)
+
 				> *
-					max-width 600px
-					margin 0 auto
 					border-bottom solid 1px rgba(0, 0, 0, 0.05)
 
 			> .no