From fff307d4bba9e3ce1b7b179d76b0f00697409c50 Mon Sep 17 00:00:00 2001
From: sei0o <sei0o@live.jp>
Date: Sat, 6 Oct 2018 17:51:59 +0900
Subject: [PATCH 1/3] fix #2346
---
dump.rdb | Bin 0 -> 93 bytes
.../common/views/components/reactions-viewer.vue | 12 ++++++++----
src/client/theme/dark.json5 | 3 ++-
src/client/theme/light.json5 | 3 ++-
4 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 dump.rdb
diff --git a/dump.rdb b/dump.rdb
new file mode 100644
index 0000000000000000000000000000000000000000..0c2a88817548164df691b878a4ffdb4f06ba53ee
GIT binary patch
literal 93
zcmWG?b@2=~Ffg$A#aWb^l3A=<mRiJSqGzCIX!wf@B9fF@QhdPS7i)4!W^U@C7|x35
tUmT^ysVTa-skw(Tm^c}J@g(M_=@t~FCgvvPq#j`S@A@+FV_iu>J^&slBo+Vw
literal 0
HcmV?d00001
diff --git a/src/client/app/common/views/components/reactions-viewer.vue b/src/client/app/common/views/components/reactions-viewer.vue
index 9212a84b31..b877638df3 100644
--- a/src/client/app/common/views/components/reactions-viewer.vue
+++ b/src/client/app/common/views/components/reactions-viewer.vue
@@ -40,19 +40,23 @@ export default Vue.extend({
<style lang="stylus" scoped>
.mk-reactions-viewer
- border-top dashed 1px var(--reactionViewerBorder)
- border-bottom dashed 1px var(--reactionViewerBorder)
- margin 4px 0
+ margin 6px 0
&:empty
display none
> span
- margin-right 8px
+ margin-right 6px
+ padding 6px 6px 6px 4px
+ border solid 1px var(--reactionViewerButtonBorder)
+ border-radius 3px
&.notReacted
cursor pointer
+ &:hover
+ border solid 1px var(--reactionViewerButtonHoverBorder)
+
> .mk-reaction-icon
font-size 1.4em
diff --git a/src/client/theme/dark.json5 b/src/client/theme/dark.json5
index 72362a2305..c69fe18cba 100644
--- a/src/client/theme/dark.json5
+++ b/src/client/theme/dark.json5
@@ -83,7 +83,8 @@
reactionPickerButtonHoverBg: 'rgba(255, 255, 255, 0.18)',
- reactionViewerBorder: 'rgba(255, 255, 255, 0.1)',
+ reactionViewerButtonBorder: 'rgba(255, 255, 255, 0.1)',
+ reactionViewerButtonHoverBorder: 'rgba(255, 255, 255, 0.2)',
pollEditorInputBg: 'rgba(0, 0, 0, 0.25)',
diff --git a/src/client/theme/light.json5 b/src/client/theme/light.json5
index 90d0d40187..db5a57d9cd 100644
--- a/src/client/theme/light.json5
+++ b/src/client/theme/light.json5
@@ -83,7 +83,8 @@
reactionPickerButtonHoverBg: '#eee',
- reactionViewerBorder: 'rgba(0, 0, 0, 0.1)',
+ reactionViewerButtonBorder: 'rgba(0, 0, 0, 0.1)',
+ reactionViewerButtonHoverBorder: 'rgba(0, 0, 0, 0.2)',
pollEditorInputBg: '#fff',
From 5cf1956135e4734629a71026b817b05a3ead2054 Mon Sep 17 00:00:00 2001
From: sei0o <sei0o@live.jp>
Date: Sat, 6 Oct 2018 22:14:30 +0900
Subject: [PATCH 2/3] Added CSS variables for background of reactions-viewer
---
src/client/app/common/views/components/reactions-viewer.vue | 4 +++-
src/client/theme/dark.json5 | 2 ++
src/client/theme/light.json5 | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/client/app/common/views/components/reactions-viewer.vue b/src/client/app/common/views/components/reactions-viewer.vue
index b877638df3..8e06b79d19 100644
--- a/src/client/app/common/views/components/reactions-viewer.vue
+++ b/src/client/app/common/views/components/reactions-viewer.vue
@@ -48,14 +48,16 @@ export default Vue.extend({
> span
margin-right 6px
padding 6px 6px 6px 4px
- border solid 1px var(--reactionViewerButtonBorder)
border-radius 3px
&.notReacted
cursor pointer
+ border solid 1px var(--reactionViewerButtonBorder)
+ background-color var(--reactionViewerButtonBg)
&:hover
border solid 1px var(--reactionViewerButtonHoverBorder)
+ background-color var(--reactionViewerButtonHoverBg)
> .mk-reaction-icon
font-size 1.4em
diff --git a/src/client/theme/dark.json5 b/src/client/theme/dark.json5
index c69fe18cba..6fa8929b2e 100644
--- a/src/client/theme/dark.json5
+++ b/src/client/theme/dark.json5
@@ -83,6 +83,8 @@
reactionPickerButtonHoverBg: 'rgba(255, 255, 255, 0.18)',
+ reactionViewerButtonBg: 'rgba(0, 0, 0, 0)',
+ reactionViewerButtonHoverBg: 'rgba(0, 0, 0, 0)',
reactionViewerButtonBorder: 'rgba(255, 255, 255, 0.1)',
reactionViewerButtonHoverBorder: 'rgba(255, 255, 255, 0.2)',
diff --git a/src/client/theme/light.json5 b/src/client/theme/light.json5
index db5a57d9cd..5c0d460534 100644
--- a/src/client/theme/light.json5
+++ b/src/client/theme/light.json5
@@ -83,6 +83,8 @@
reactionPickerButtonHoverBg: '#eee',
+ reactionViewerButtonBg: 'rgba(0, 0, 0, 0)',
+ reactionViewerButtonHoverBg: 'rgba(0, 0, 0, 0)',
reactionViewerButtonBorder: 'rgba(0, 0, 0, 0.1)',
reactionViewerButtonHoverBorder: 'rgba(0, 0, 0, 0.2)',
From b79169b9755f8b115a3f6db5267a10f100fd398a Mon Sep 17 00:00:00 2001
From: sei0o <sei0o@live.jp>
Date: Mon, 8 Oct 2018 22:26:26 +0900
Subject: [PATCH 3/3] Deleted dump.rdb
---
dump.rdb | Bin 93 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 dump.rdb
diff --git a/dump.rdb b/dump.rdb
deleted file mode 100644
index 0c2a88817548164df691b878a4ffdb4f06ba53ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 93
zcmWG?b@2=~Ffg$A#aWb^l3A=<mRiJSqGzCIX!wf@B9fF@QhdPS7i)4!W^U@C7|x35
tUmT^ysVTa-skw(Tm^c}J@g(M_=@t~FCgvvPq#j`S@A@+FV_iu>J^&slBo+Vw