From 50a6bcb693806bacaac0ad339ca3dc46de350f65 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 8 Feb 2018 14:02:08 +0900 Subject: wip --- src/web/app/ch/tags/channel.tag | 2 +- src/web/app/common/tags/poll.tag | 109 --------------------- src/web/app/common/tags/poll.vue | 117 +++++++++++++++++++++++ src/web/app/common/tags/signin.tag | 2 +- src/web/app/desktop/tags/big-follow-button.tag | 2 +- src/web/app/desktop/tags/drive/browser.tag | 2 +- src/web/app/desktop/tags/follow-button.tag | 2 +- src/web/app/desktop/tags/post-detail.tag | 2 +- src/web/app/desktop/tags/post-form.tag | 4 +- src/web/app/desktop/tags/settings.tag | 20 ++-- src/web/app/desktop/tags/timeline.tag | 2 +- src/web/app/mobile/tags/follow-button.tag | 2 +- src/web/app/mobile/tags/notification-preview.tag | 2 +- src/web/app/mobile/tags/notification.tag | 2 +- src/web/app/mobile/tags/post-detail.tag | 2 +- src/web/app/mobile/tags/timeline.tag | 4 +- 16 files changed, 142 insertions(+), 134 deletions(-) delete mode 100644 src/web/app/common/tags/poll.tag create mode 100644 src/web/app/common/tags/poll.vue (limited to 'src/web') diff --git a/src/web/app/ch/tags/channel.tag b/src/web/app/ch/tags/channel.tag index a706a247f5..d71837af4e 100644 --- a/src/web/app/ch/tags/channel.tag +++ b/src/web/app/ch/tags/channel.tag @@ -246,7 +246,7 @@
-
diff --git a/src/web/app/common/tags/poll.tag b/src/web/app/common/tags/poll.tag deleted file mode 100644 index c0605d890b..0000000000 --- a/src/web/app/common/tags/poll.tag +++ /dev/null @@ -1,109 +0,0 @@ - - -

- { '%i18n:common.tags.mk-poll.total-users%'.replace('{}', total) } - ・ - { result ? '%i18n:common.tags.mk-poll.vote%' : '%i18n:common.tags.mk-poll.show-result%' } - %i18n:common.tags.mk-poll.voted% -

- - -
diff --git a/src/web/app/common/tags/poll.vue b/src/web/app/common/tags/poll.vue new file mode 100644 index 0000000000..638fa1cbe4 --- /dev/null +++ b/src/web/app/common/tags/poll.vue @@ -0,0 +1,117 @@ + + + + + + + + + diff --git a/src/web/app/common/tags/signin.tag b/src/web/app/common/tags/signin.tag index 441a8ec56c..76a55c7e05 100644 --- a/src/web/app/common/tags/signin.tag +++ b/src/web/app/common/tags/signin.tag @@ -1,5 +1,5 @@ -
+ diff --git a/src/web/app/desktop/tags/big-follow-button.tag b/src/web/app/desktop/tags/big-follow-button.tag index 6d43e4abeb..09b587c379 100644 --- a/src/web/app/desktop/tags/big-follow-button.tag +++ b/src/web/app/desktop/tags/big-follow-button.tag @@ -1,5 +1,5 @@ - -

{ '%i18n:desktop.tags.mk-post-form.text-remain%'.replace('{}', 1000 - refs.text.value.length) }

- diff --git a/src/web/app/desktop/tags/settings.tag b/src/web/app/desktop/tags/settings.tag index 3288ba7217..191d1d754a 100644 --- a/src/web/app/desktop/tags/settings.tag +++ b/src/web/app/desktop/tags/settings.tag @@ -1,15 +1,15 @@
diff --git a/src/web/app/desktop/tags/timeline.tag b/src/web/app/desktop/tags/timeline.tag index 4853533469..772140dcc6 100644 --- a/src/web/app/desktop/tags/timeline.tag +++ b/src/web/app/desktop/tags/timeline.tag @@ -135,7 +135,7 @@ - - -