From fff307d4bba9e3ce1b7b179d76b0f00697409c50 Mon Sep 17 00:00:00 2001 From: sei0o Date: Sat, 6 Oct 2018 17:51:59 +0900 Subject: fix #2346 --- src/client/theme/dark.json5 | 3 ++- src/client/theme/light.json5 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/client/theme') 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', -- cgit v1.2.3-freya From 5cf1956135e4734629a71026b817b05a3ead2054 Mon Sep 17 00:00:00 2001 From: sei0o Date: Sat, 6 Oct 2018 22:14:30 +0900 Subject: 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(-) (limited to 'src/client/theme') 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)', -- cgit v1.2.3-freya