summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-06-26 18:25:27 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-06-26 18:25:27 +0900
commit36c2f8fe5d550b7aa4acbfc242ff4ec456727b78 (patch)
treedd1671b35c8099b8da95ccad69ebd2407d230b95 /src/client
parentMerge pull request #1774 from syuilo/greenkeeper/webpack-4.12.1 (diff)
downloadsharkey-36c2f8fe5d550b7aa4acbfc242ff4ec456727b78.tar.gz
sharkey-36c2f8fe5d550b7aa4acbfc242ff4ec456727b78.tar.bz2
sharkey-36c2f8fe5d550b7aa4acbfc242ff4ec456727b78.zip
Improve usability
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/views/components/reaction-picker.vue35
-rw-r--r--src/client/app/mobile/views/components/note-detail.vue3
-rw-r--r--src/client/app/mobile/views/components/note.vue3
3 files changed, 37 insertions, 4 deletions
diff --git a/src/client/app/common/views/components/reaction-picker.vue b/src/client/app/common/views/components/reaction-picker.vue
index 0db6f66b37..ed7aedb58e 100644
--- a/src/client/app/common/views/components/reaction-picker.vue
+++ b/src/client/app/common/views/components/reaction-picker.vue
@@ -1,7 +1,7 @@
<template>
<div class="mk-reaction-picker">
<div class="backdrop" ref="backdrop" @click="close"></div>
- <div class="popover" :class="{ compact }" ref="popover">
+ <div class="popover" :class="{ compact, big }" ref="popover">
<p v-if="!compact">{{ title }}</p>
<div>
<button @click="react('like')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="1" title="%i18n:common.reactions.like%"><mk-reaction-icon reaction='like'/></button>
@@ -25,7 +25,28 @@ import * as anime from 'animejs';
const placeholder = '%i18n:@choose-reaction%';
export default Vue.extend({
- props: ['note', 'source', 'compact', 'cb'],
+ props: {
+ note: {
+ type: Object,
+ required: true
+ },
+ source: {
+ required: true
+ },
+ compact: {
+ type: Boolean,
+ required: false,
+ default: false
+ },
+ cb: {
+ required: false
+ },
+ big: {
+ type: Boolean,
+ required: false,
+ default: false
+ }
+ },
data() {
return {
title: placeholder
@@ -162,6 +183,16 @@ root(isDark)
border-right solid $balloon-size transparent
border-bottom solid $balloon-size $bgcolor
+ &.compact
+ > div
+ width 280px
+
+ > button
+ width 50px
+ height 50px
+ font-size 28px
+ border-radius 4px
+
> p
display block
margin 0
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index 76633490fd..48c9c8bcb0 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@@ -197,7 +197,8 @@ export default Vue.extend({
(this as any).os.new(MkReactionPicker, {
source: this.$refs.reactButton,
note: this.p,
- compact: true
+ compact: true,
+ big: true
});
},
menu() {
diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue
index c3d4181a5d..c947a6c562 100644
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@@ -213,7 +213,8 @@ export default Vue.extend({
(this as any).os.new(MkReactionPicker, {
source: this.$refs.reactButton,
note: this.p,
- compact: true
+ compact: true,
+ big: true
});
},