diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-05-08 08:35:30 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-05-08 08:35:30 +0000 |
| commit | 1186205583715b187bb4e503dc35e8c0644cfc7e (patch) | |
| tree | c439d51bcc3a5a972fc763ab96ade4cee9bed7a1 /src/components/react_button | |
| parent | 8b1aa593a46869ac1ea26de8a1f31d9fa2f44e56 (diff) | |
| parent | 921eedfd84007da72619a553ba8d074076559e7a (diff) | |
Merge branch 'develop' into 'feat/relationship-refactor'
# Conflicts:
# src/components/notification/notification.js
Diffstat (limited to 'src/components/react_button')
| -rw-r--r-- | src/components/react_button/react_button.js | 2 | ||||
| -rw-r--r-- | src/components/react_button/react_button.vue | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js index 19949563..abc3bf07 100644 --- a/src/components/react_button/react_button.js +++ b/src/components/react_button/react_button.js @@ -2,7 +2,7 @@ import Popover from '../popover/popover.vue' import { mapGetters } from 'vuex' const ReactButton = { - props: ['status', 'loggedIn'], + props: ['status'], data () { return { filterWord: '' diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index ab4b4fcd..0b34add1 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -37,7 +37,6 @@ </div> </div> <i - v-if="loggedIn" slot="trigger" class="icon-smile button-icon add-reaction-button" :title="$t('tool_tip.add_reaction')" |
