usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2018-12-03 20:26:38 +09:00
parent 9ff349c548 0935bd4bd4
commit 53a0f3c794
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/app/desktop/views/pages/user/user.discord.vue
View File

@ -1,7 +1,9 @@
<template> <template>
<div class="lkafjvabenanajk17kwqpsatoushincb"> <a class="lkafjvabenanajk17kwqpsatoushincb" :href="`https://discordapp.com/users/${user.discord.id}`" target="_blank">
<span><fa :icon="['fab', 'discord']"/><a :href="`https://discordapp.com/users/${user.discord.id}`" target="_blank">@{{ user.discord.username }}#{{ user.discord.discriminator }}</a></span> <div>
</div> <span><fa :icon="['fab', 'discord']"/>@{{ user.discord.username }}#{{ user.discord.discriminator }}</span>
</div>
</a>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -14,13 +16,13 @@ export default Vue.extend({
<style lang="stylus" scoped> <style lang="stylus" scoped>
.lkafjvabenanajk17kwqpsatoushincb .lkafjvabenanajk17kwqpsatoushincb
margin-left 8px
color #fff
div
padding 32px padding 32px
background #7289da background #7289da
border-radius 6px border-radius 6px
color #fff color #fff
a
margin-left 8px
color #fff
</style> </style>

16
src/client/app/desktop/views/pages/user/user.github.vue
View File

@ -1,7 +1,9 @@
<template> <template>
<div class="aqooishiizumijmihokohinatamihoaz"> <a class="aqooishiizumijmihokohinatamihoaz" :href="`https://github.com/${user.github.login}`" target="_blank">
<span><fa :icon="['fab', 'github']"/><a :href="`https://github.com/${user.github.login}`" target="_blank">@{{ user.github.login }}</a></span> <div>
</div> <span><fa :icon="['fab', 'github']"/>@{{ user.github.login }}</span>
</div>
</a>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -14,13 +16,13 @@ export default Vue.extend({
<style lang="stylus" scoped> <style lang="stylus" scoped>
.aqooishiizumijmihokohinatamihoaz .aqooishiizumijmihokohinatamihoaz
margin-left 8px
color #fff
div
padding 32px padding 32px
background #171515 background #171515
border-radius 6px border-radius 6px
color #fff color #fff
a
margin-left 8px
color #fff
</style> </style>

16
src/client/app/desktop/views/pages/user/user.twitter.vue
View File

@ -1,7 +1,9 @@
<template> <template>
<div class="adsvaidqfznoartcbplullnejvxjphcn"> <a class="adsvaidqfznoartcbplullnejvxjphcn" :href="`https://twitter.com/${user.twitter.screenName}`" target="_blank">
<span><fa :icon="['fab', 'twitter']"/><a :href="`https://twitter.com/${user.twitter.screenName}`" target="_blank">@{{ user.twitter.screenName }}</a></span> <div>
</div> <span><fa :icon="['fab', 'twitter']"/>@{{ user.twitter.screenName }}</span>
</div>
</a>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -14,13 +16,13 @@ export default Vue.extend({
<style lang="stylus" scoped> <style lang="stylus" scoped>
.adsvaidqfznoartcbplullnejvxjphcn .adsvaidqfznoartcbplullnejvxjphcn
margin-left 8px
color #fff
div
padding 32px padding 32px
background #1a94f2 background #1a94f2
border-radius 6px border-radius 6px
color #fff color #fff
a
margin-left 8px
color #fff
</style> </style>