mirror of
https://github.com/paricafe/misskey.git
synced 2024-11-28 13:06:44 -06:00
wip
This commit is contained in:
parent
4d6c8efe44
commit
016144b960
7 changed files with 55 additions and 30 deletions
|
@ -364,7 +364,6 @@ groups: "グループ"
|
||||||
createGroup: "グループを作成"
|
createGroup: "グループを作成"
|
||||||
ownedGroups: "所有グループ"
|
ownedGroups: "所有グループ"
|
||||||
joinedGroups: "参加しているグループ"
|
joinedGroups: "参加しているグループ"
|
||||||
invite: "招待"
|
|
||||||
invites: "招待"
|
invites: "招待"
|
||||||
groupName: "グループ名"
|
groupName: "グループ名"
|
||||||
members: "メンバー"
|
members: "メンバー"
|
||||||
|
|
|
@ -154,21 +154,17 @@ export default Vue.component('misskey-flavored-markdown', {
|
||||||
url: token.node.props.url,
|
url: token.node.props.url,
|
||||||
rel: 'nofollow noopener',
|
rel: 'nofollow noopener',
|
||||||
},
|
},
|
||||||
attrs: {
|
|
||||||
style: 'color:var(--link);'
|
|
||||||
}
|
|
||||||
})];
|
})];
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'link': {
|
case 'link': {
|
||||||
return [createElement('a', {
|
return [createElement('a', {
|
||||||
attrs: {
|
attrs: {
|
||||||
class: 'link',
|
class: 'link _link',
|
||||||
href: token.node.props.url,
|
href: token.node.props.url,
|
||||||
rel: 'nofollow noopener',
|
rel: 'nofollow noopener',
|
||||||
target: '_blank',
|
target: '_blank',
|
||||||
title: token.node.props.url,
|
title: token.node.props.url,
|
||||||
style: 'color:var(--link);'
|
|
||||||
}
|
}
|
||||||
}, genEl(token.children))];
|
}, genEl(token.children))];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<component :is="hasRoute ? 'router-link' : 'a'" class="mk-url" :[attr]="hasRoute ? url.substr(local.length) : url" :rel="rel" :target="target">
|
<component :is="hasRoute ? 'router-link' : 'a'" class="ieqqeuvs _link" :[attr]="hasRoute ? url.substr(local.length) : url" :rel="rel" :target="target">
|
||||||
<template v-if="!self">
|
<template v-if="!self">
|
||||||
<span class="schema">{{ schema }}//</span>
|
<span class="schema">{{ schema }}//</span>
|
||||||
<span class="hostname">{{ hostname }}</span>
|
<span class="hostname">{{ hostname }}</span>
|
||||||
|
@ -58,7 +58,7 @@ export default Vue.extend({
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.mk-url {
|
.ieqqeuvs {
|
||||||
word-break: break-all;
|
word-break: break-all;
|
||||||
|
|
||||||
> .icon {
|
> .icon {
|
||||||
|
|
|
@ -27,17 +27,17 @@
|
||||||
<div style="margin-bottom: 1em;">{{ $t('aboutMisskeyText') }}</div>
|
<div style="margin-bottom: 1em;">{{ $t('aboutMisskeyText') }}</div>
|
||||||
<div>{{ $t('misskeyMembers') }}</div>
|
<div>{{ $t('misskeyMembers') }}</div>
|
||||||
<span class="members">
|
<span class="members">
|
||||||
<a href="https://github.com/syuilo" target="_blank">@syuilo</a>
|
<a href="https://github.com/syuilo" target="_blank" class="_link">@syuilo</a>
|
||||||
<a href="https://github.com/AyaMorisawa" target="_blank">@AyaMorisawa</a>
|
<a href="https://github.com/AyaMorisawa" target="_blank" class="_link">@AyaMorisawa</a>
|
||||||
<a href="https://github.com/mei23" target="_blank">@mei23</a>
|
<a href="https://github.com/mei23" target="_blank" class="_link">@mei23</a>
|
||||||
<a href="https://github.com/acid-chicken" target="_blank">@acid-chicken</a>
|
<a href="https://github.com/acid-chicken" target="_blank" class="_link">@acid-chicken</a>
|
||||||
<a href="https://github.com/tamaina" target="_blank">@tamaina</a>
|
<a href="https://github.com/tamaina" target="_blank" class="_link">@tamaina</a>
|
||||||
<a href="https://github.com/rinsuki" target="_blank">@rinsuki</a>
|
<a href="https://github.com/rinsuki" target="_blank" class="_link">@rinsuki</a>
|
||||||
</span>
|
</span>
|
||||||
<div style="margin-top: 1em;">{{ $t('misskeySource') }}</div>
|
<div style="margin-top: 1em;">{{ $t('misskeySource') }}</div>
|
||||||
<a href="https://github.com/syuilo/misskey" target="_blank" style="color: var(--link);">https://github.com/syuilo/misskey</a>
|
<mk-url url="https://github.com/syuilo/misskey"/>
|
||||||
<div style="margin-top: 1em;">{{ $t('misskeyDonate') }}</div>
|
<div style="margin-top: 1em;">{{ $t('misskeyDonate') }}</div>
|
||||||
<a href="https://www.patreon.com/syuilo" target="_blank" style="color: var(--link);">https://www.patreon.com/syuilo</a>
|
<mk-url url="https://www.patreon.com/syuilo"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="_content">
|
<div class="_content">
|
||||||
<span><mfm text="<motion>❤</motion>"/> {{ $t('patrons') }}</span>
|
<span><mfm text="<motion>❤</motion>"/> {{ $t('patrons') }}</span>
|
||||||
|
@ -121,7 +121,6 @@ export default Vue.extend({
|
||||||
> ._content {
|
> ._content {
|
||||||
> .members {
|
> .members {
|
||||||
> a {
|
> a {
|
||||||
color: var(--link);
|
|
||||||
margin-right: 0.5em;
|
margin-right: 0.5em;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
<mk-container :body-togglable="true">
|
<mk-container :body-togglable="true">
|
||||||
<template #header><fa :icon="faUsers"/> {{ $t('ownedGroups') }}</template>
|
<template #header><fa :icon="faUsers"/> {{ $t('ownedGroups') }}</template>
|
||||||
<mk-pagination :pagination="ownedPagination" #default="{items}" ref="owned">
|
<mk-pagination :pagination="ownedPagination" #default="{items}" ref="owned">
|
||||||
<div class="" v-for="group in items" :key="group.id">
|
<div class="_frame" v-for="group in items" :key="group.id">
|
||||||
<router-link :to="`/my/groups/${ group.id }`">{{ group.name }}</router-link>
|
<div class="_title"><router-link :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</router-link></div>
|
||||||
</div>
|
</div>
|
||||||
</mk-pagination>
|
</mk-pagination>
|
||||||
</mk-container>
|
</mk-container>
|
||||||
|
@ -17,13 +17,13 @@
|
||||||
<mk-container :body-togglable="true">
|
<mk-container :body-togglable="true">
|
||||||
<template #header><fa :icon="faEnvelopeOpenText"/> {{ $t('invites') }}</template>
|
<template #header><fa :icon="faEnvelopeOpenText"/> {{ $t('invites') }}</template>
|
||||||
<mk-pagination :pagination="invitePagination" #default="{items}">
|
<mk-pagination :pagination="invitePagination" #default="{items}">
|
||||||
<div class="" v-for="invite in items" :key="invite.id">
|
<div class="_frame" v-for="invite in items" :key="invite.id">
|
||||||
<div class="name">{{ invite.group.name }}</div>
|
<div class="_title">{{ invite.group.name }}</div>
|
||||||
<x-avatars :user-ids="invite.group.userIds" style="margin-top:8px;"/>
|
<div class="_content"><x-avatars :user-ids="invite.group.userIds"/></div>
|
||||||
<ui-horizon-group>
|
<div class="_footer">
|
||||||
<ui-button @click="acceptInvite(invite)"><fa :icon="faCheck"/> {{ $t('accept') }}</ui-button>
|
<mk-button @click="acceptInvite(invite)" primary inline><fa :icon="faCheck"/> {{ $t('accept') }}</mk-button>
|
||||||
<ui-button @click="rejectInvite(invite)"><fa :icon="faBan"/> {{ $t('reject') }}</ui-button>
|
<mk-button @click="rejectInvite(invite)" primary inline><fa :icon="faBan"/> {{ $t('reject') }}</mk-button>
|
||||||
</ui-horizon-group>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</mk-pagination>
|
</mk-pagination>
|
||||||
</mk-container>
|
</mk-container>
|
||||||
|
@ -31,8 +31,8 @@
|
||||||
<mk-container :body-togglable="true">
|
<mk-container :body-togglable="true">
|
||||||
<template #header><fa :icon="faUsers"/> {{ $t('joinedGroups') }}</template>
|
<template #header><fa :icon="faUsers"/> {{ $t('joinedGroups') }}</template>
|
||||||
<mk-pagination :pagination="joinedPagination" #default="{items}">
|
<mk-pagination :pagination="joinedPagination" #default="{items}">
|
||||||
<div class="" v-for="group in items" :key="group.id">
|
<div class="_frame" v-for="group in items" :key="group.id">
|
||||||
<div>{{ group.name }}</div>
|
<div class="_title">{{ group.name }}</div>
|
||||||
</div>
|
</div>
|
||||||
</mk-pagination>
|
</mk-pagination>
|
||||||
</mk-container>
|
</mk-container>
|
||||||
|
|
|
@ -46,8 +46,8 @@
|
||||||
<ol style="margin: 0; padding: 0 0 0 1em;">
|
<ol style="margin: 0; padding: 0 0 0 1em;">
|
||||||
<li>
|
<li>
|
||||||
<i18n path="_2fa.step1" tag="span">
|
<i18n path="_2fa.step1" tag="span">
|
||||||
<a href="https://authy.com/" rel="noopener" target="_blank" place="a" style="color: var(--link);">Authy</a>
|
<a href="https://authy.com/" rel="noopener" target="_blank" place="a" class="_link">Authy</a>
|
||||||
<a href="https://support.google.com/accounts/answer/1066447" rel="noopener" target="_blank" place="b" style="color: var(--link);">Google Authenticator</a>
|
<a href="https://support.google.com/accounts/answer/1066447" rel="noopener" target="_blank" place="b" class="_link">Google Authenticator</a>
|
||||||
</i18n>
|
</i18n>
|
||||||
</li>
|
</li>
|
||||||
<li>{{ $t('_2fa.step2') }}<br><img :src="data.qr"></li>
|
<li>{{ $t('_2fa.step2') }}<br><img :src="data.qr"></li>
|
||||||
|
|
|
@ -301,6 +301,37 @@ a {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
._frame {
|
||||||
|
position: relative;
|
||||||
|
border: solid 1px var(--divider);
|
||||||
|
border-radius: var(--radius);
|
||||||
|
margin: var(--marginHalf);
|
||||||
|
|
||||||
|
> ._title {
|
||||||
|
margin: 0;
|
||||||
|
padding: 16px;
|
||||||
|
border-bottom: solid 1px var(--divider);
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
> ._content {
|
||||||
|
padding: 16px;
|
||||||
|
|
||||||
|
& + ._content {
|
||||||
|
border-top: solid 1px var(--divider);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
> ._footer {
|
||||||
|
border-top: solid 1px var(--divider);
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
._link {
|
||||||
|
color: var(--link);
|
||||||
|
}
|
||||||
|
|
||||||
.zoom-enter-active, .zoom-leave-active {
|
.zoom-enter-active, .zoom-leave-active {
|
||||||
transition: opacity 0.5s, transform 0.5s !important;
|
transition: opacity 0.5s, transform 0.5s !important;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue