summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-02-15 14:58:15 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-02-15 14:58:15 +0900
commit8336910a597f947a8aab7ebd1772380aff932df7 (patch)
tree27832b9a9e7ec5232d93223f7f15777b8f347621 /src
parent検索結果を内部コンポーネントに (diff)
downloadmisskey-8336910a597f947a8aab7ebd1772380aff932df7.tar.gz
misskey-8336910a597f947a8aab7ebd1772380aff932df7.tar.bz2
misskey-8336910a597f947a8aab7ebd1772380aff932df7.zip
:art:
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/home/user/user.integrations.vue7
-rw-r--r--src/client/app/desktop/views/home/user/user.vue2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/client/app/desktop/views/home/user/user.integrations.vue b/src/client/app/desktop/views/home/user/user.integrations.vue
index d796ff9321..a2be48b3b8 100644
--- a/src/client/app/desktop/views/home/user/user.integrations.vue
+++ b/src/client/app/desktop/views/home/user/user.integrations.vue
@@ -20,15 +20,18 @@ export default Vue.extend({
<style lang="stylus" scoped>
.usertwitxxxgithxxdiscxxxintegrat
+ display flex
+
> a
display flex
+ flex 1
align-items center
- padding 32px 38px
+ padding 16px
box-shadow var(--shadow)
border-radius var(--round)
&:not(:last-child)
- margin-bottom 16px
+ margin-right 16px
&:hover
text-decoration none
diff --git a/src/client/app/desktop/views/home/user/user.vue b/src/client/app/desktop/views/home/user/user.vue
index 32b1dc2e45..7eed9b172d 100644
--- a/src/client/app/desktop/views/home/user/user.vue
+++ b/src/client/app/desktop/views/home/user/user.vue
@@ -4,8 +4,8 @@
<div class="is-remote" v-if="user.host != null"><fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url || user.uri" target="_blank">{{ $t('@.view-on-remote') }}</a></div>
<div class="main">
<x-header :user="user"/>
- <mk-note-detail v-for="n in user.pinnedNotes" :key="n.id" :note="n" :compact="true"/>
<x-integrations :user="user"/>
+ <mk-note-detail v-for="n in user.pinnedNotes" :key="n.id" :note="n" :compact="true"/>
<!--<mk-calendar @chosen="warp" :start="new Date(user.createdAt)"/>-->
<div class="activity">
<mk-widget-container :show-header="true" :naked="false">