From 09a388dead2b8d8e560d0fb707fa9f51ec23a5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=B4=E3=81=AA=E3=81=9F=E3=81=BF=E3=81=BD?= <syuilotan@yahoo.co.jp> Date: Fri, 16 Feb 2018 17:43:25 +0900 Subject: [PATCH] wip --- .../desktop/-tags/user-followers-window.tag | 19 -------------- .../desktop/-tags/user-following-window.tag | 19 -------------- .../views/components/followers-window.vue | 26 +++++++++++++++++++ .../views/components/following-window.vue | 26 +++++++++++++++++++ 4 files changed, 52 insertions(+), 38 deletions(-) delete mode 100644 src/web/app/desktop/-tags/user-followers-window.tag delete mode 100644 src/web/app/desktop/-tags/user-following-window.tag create mode 100644 src/web/app/desktop/views/components/followers-window.vue create mode 100644 src/web/app/desktop/views/components/following-window.vue diff --git a/src/web/app/desktop/-tags/user-followers-window.tag b/src/web/app/desktop/-tags/user-followers-window.tag deleted file mode 100644 index 82bec6992d..0000000000 --- a/src/web/app/desktop/-tags/user-followers-window.tag +++ /dev/null @@ -1,19 +0,0 @@ -<mk-user-followers-window> - <mk-window is-modal={ false } width={ '400px' } height={ '550px' }><yield to="header"><img src={ parent.user.avatar_url + '?thumbnail&size=64' } alt=""/>{ parent.user.name }ã®ãƒ•ã‚©ãƒãƒ¯ãƒ¼</yield> -<yield to="content"> - <mk-user-followers user={ parent.user }/></yield> - </mk-window> - <style lang="stylus" scoped> - :scope - > mk-window - [data-yield='header'] - > img - display inline-block - vertical-align bottom - height calc(100% - 10px) - margin 5px - border-radius 4px - - </style> - <script lang="typescript">this.user = this.opts.user</script> -</mk-user-followers-window> diff --git a/src/web/app/desktop/-tags/user-following-window.tag b/src/web/app/desktop/-tags/user-following-window.tag deleted file mode 100644 index 0f1c4b3ea6..0000000000 --- a/src/web/app/desktop/-tags/user-following-window.tag +++ /dev/null @@ -1,19 +0,0 @@ -<mk-user-following-window> - <mk-window is-modal={ false } width={ '400px' } height={ '550px' }><yield to="header"><img src={ parent.user.avatar_url + '?thumbnail&size=64' } alt=""/>{ parent.user.name }ã®ãƒ•ã‚©ãƒãƒ¼</yield> -<yield to="content"> - <mk-user-following user={ parent.user }/></yield> - </mk-window> - <style lang="stylus" scoped> - :scope - > mk-window - [data-yield='header'] - > img - display inline-block - vertical-align bottom - height calc(100% - 10px) - margin 5px - border-radius 4px - - </style> - <script lang="typescript">this.user = this.opts.user</script> -</mk-user-following-window> diff --git a/src/web/app/desktop/views/components/followers-window.vue b/src/web/app/desktop/views/components/followers-window.vue new file mode 100644 index 0000000000..e56545cccb --- /dev/null +++ b/src/web/app/desktop/views/components/followers-window.vue @@ -0,0 +1,26 @@ +<template> +<mk-window width='400px' height='550px' @closed="$destroy"> + <span slot="header" :class="$style.header"> + <img :src="`${user.avatar_url}?thumbnail&size=64`" alt=""/>{{ user.name }}ã®ãƒ•ã‚©ãƒãƒ¯ãƒ¼ + </span> + <mk-user-followers :user="user"/> +</mk-window> +</template> + +<script lang="ts"> +import Vue from 'vue'; +export default Vue.extend({ + props: ['user'] +}); +</script> + +<style lang="stylus" module> +.header + > img + display inline-block + vertical-align bottom + height calc(100% - 10px) + margin 5px + border-radius 4px + +</style> diff --git a/src/web/app/desktop/views/components/following-window.vue b/src/web/app/desktop/views/components/following-window.vue new file mode 100644 index 0000000000..fa2edfa473 --- /dev/null +++ b/src/web/app/desktop/views/components/following-window.vue @@ -0,0 +1,26 @@ +<template> +<mk-window width='400px' height='550px' @closed="$destroy"> + <span slot="header" :class="$style.header"> + <img :src="`${user.avatar_url}?thumbnail&size=64`" alt=""/>{{ user.name }}ã®ãƒ•ã‚©ãƒãƒ¼ + </span> + <mk-user-following :user="user"/> +</mk-window> +</template> + +<script lang="ts"> +import Vue from 'vue'; +export default Vue.extend({ + props: ['user'] +}); +</script> + +<style lang="stylus" module> +.header + > img + display inline-block + vertical-align bottom + height calc(100% - 10px) + margin 5px + border-radius 4px + +</style> -- GitLab