moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

wip

Browse Source
This commit is contained in:
syuilo 2018-02-22 22:27:28 +09:00
parent bc632cefe5
commit 29b7bd258c
9 changed files with 70 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/web/app/common/-tags/introduction.tag
View File

@ -1,25 +0,0 @@
<mk-introduction>
<article>
<h1>Misskeyとは？</h1>
<p><ruby>Misskey<rt>みすきー</rt></ruby>は、<a href="http://syuilo.com" target="_blank">syuilo</a>が2014年くらいから<a href="https://github.com/syuilo/misskey" target="_blank">オープンソースで</a>開発・運営を行っている、ミニブログベースのSNSです。</p>
<p>無料で誰でも利用でき、広告も掲載していません。</p>
<p><a href={ _DOCS_URL_ } target="_blank">もっと知りたい方はこちら</a></p>
</article>
<style lang="stylus" scoped>
:scope
display block
h1
margin 0
text-align center
font-size 1.2em
p
margin 16px 0
&:last-child
margin 0
text-align center
</style>
</mk-introduction>

2
src/web/app/common/views/components/post-html.ts
View File

@ -93,6 +93,6 @@ export default Vue.component('mk-post-html', {
}
}));
return createElement('div', els);
return createElement('span', els);
}
});

2
src/web/app/common/views/components/twitter-setting.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="mk-twitter-setting">
<p>%i18n:common.tags.mk-twitter-setting.description%<a :href="`${docsUrl}/link-to-twitter`" target="_blank">%i18n:common.tags.mk-twitter-setting.detail%</a></p>
<p class="account" v-if="os.i.twitter" :title="`Twitter ID: ${os.i.twitter.user_id}`">%i18n:common.tags.mk-twitter-setting.connected-to%: <a :href="`https://twitter.com/${os.i.twitter.screen_name}`" target="_blank">@{{ I.twitter.screen_name }}</a></p>
<p class="account" v-if="os.i.twitter" :title="`Twitter ID: ${os.i.twitter.user_id}`">%i18n:common.tags.mk-twitter-setting.connected-to%: <a :href="`https://twitter.com/${os.i.twitter.screen_name}`" target="_blank">@{{ os.i.twitter.screen_name }}</a></p>
<p>
<a :href="`${apiUrl}/connect/twitter`" target="_blank" @click.prevent="connect">{{ os.i.twitter ? '%i18n:common.tags.mk-twitter-setting.reconnect%' : '%i18n:common.tags.mk-twitter-setting.connect%' }}</a>
<span v-if="os.i.twitter"> or </span>

5
src/web/app/desktop/views/components/posts.post.sub.vue
View File

@ -35,11 +35,8 @@ export default Vue.extend({
<style lang="stylus" scoped>
.sub
margin 0
padding 0
font-size 0.9em
> article
padding 16px
font-size 0.9em
&:after
content ""

2
src/web/app/desktop/views/components/posts.post.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="post" tabindex="-1" :title="title" @keydown="onKeydown">
<div class="reply-to" v-if="p.reply">
<x-sub post="p.reply"/>
<x-sub :post="p.reply"/>
</div>
<div class="repost" v-if="isRepost">
<p>

2
src/web/app/desktop/views/components/widgets/broadcast.vue
View File

@ -12,7 +12,7 @@
<p class="fetching" v-if="fetching">%i18n:desktop.tags.mk-broadcast-home-widget.fetching%<mk-ellipsis/></p>
<h1 v-if="!fetching">{{ broadcasts.length == 0 ? '%i18n:desktop.tags.mk-broadcast-home-widget.no-broadcasts%' : broadcasts[i].title }}</h1>
<p v-if="!fetching">
<span v-if="broadcasts.length != 0" :v-html="broadcasts[i].text"></span>
<span v-if="broadcasts.length != 0" v-html="broadcasts[i].text"></span>
<template v-if="broadcasts.length == 0">%i18n:desktop.tags.mk-broadcast-home-widget.have-a-nice-day%</template>
</p>
<a v-if="broadcasts.length > 1" @click="next">%i18n:desktop.tags.mk-broadcast-home-widget.next% &gt;&gt;</a>

6
src/web/app/desktop/views/components/widgets/channel.channel.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="channel">
<p v-if="fetching">読み込み中<mk-ellipsis/></p>
<div v-if="!fetching" ref="posts">
<div v-if="!fetching" ref="posts" class="posts">
<p v-if="posts.length == 0">まだ投稿がありません</p>
<x-post class="post" v-for="post in posts.slice().reverse()" :post="post" :key="post.id" @reply="reply"/>
</div>
@ -34,7 +34,9 @@ export default Vue.extend({
}
},
mounted() {
this.$nextTick(() => {
this.zap();
});
},
beforeDestroy() {
this.disconnect();
@ -85,7 +87,7 @@ export default Vue.extend({
text-align center
color #aaa
> div
> .posts
height calc(100% - 38px)
overflow auto
font-size 0.9em

2
src/web/app/desktop/views/components/widgets/channel.vue
View File

@ -5,7 +5,7 @@
<button @click="settings" title="%i18n:desktop.tags.mk-channel-home-widget.settings%">%fa:cog%</button>
</template>
<p class="get-started" v-if="props.channel == null">%i18n:desktop.tags.mk-channel-home-widget.get-started%</p>
<x-channel class="channel" :channel="channel" v-else/>
<x-channel class="channel" :channel="channel" v-if="channel != null"/>
</div>
</template>

2
src/web/app/mobile/views/components/posts.post.sub.vue
View File

@ -7,7 +7,7 @@
<header>
<router-link class="name" :to="`/${post.user.username}`">{{ post.user.name }}</router-link>
<span class="username">@{{ post.user.username }}</span>
<router-link class="created-at" :href="`/${post.user.username}/${post.id}`">
<router-link class="created-at" :to="`/${post.user.username}/${post.id}`">
<mk-time :time="post.created_at"/>
</router-link>
</header>