mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-30 07:48:57 +09:00
Code

Merge pull request #2830 from sei0o/fix-2346

Browse Source 
fix #2346
This commit is contained in:
syuilo 2018-10-09 00:55:47 +09:00 committed by GitHub
commit e5cf3aecd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/client/app/common/views/components/reactions-viewer.vue
View File

@ -40,18 +40,24 @@ 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-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

5
src/client/theme/dark.json5
View File

@ -84,7 +84,10 @@
reactionPickerButtonHoverBg: 'rgba(255, 255, 255, 0.18)',
reactionViewerBorder: 'rgba(255, 255, 255, 0.1)',
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)',
pollEditorInputBg: 'rgba(0, 0, 0, 0.25)',

5
src/client/theme/light.json5
View File

@ -84,7 +84,10 @@
reactionPickerButtonHoverBg: '#eee',
reactionViewerBorder: 'rgba(0, 0, 0, 0.1)',
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)',
pollEditorInputBg: '#fff',