krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
negue
2018-11-18 22:12:41 +01:00
parent 8b15d94ae1
commit 3f47cdd9a2
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/chat/chatCard.vue
View File

@@ -40,7 +40,7 @@ div
| +{{ likeCount }} | +{{ likeCount }}
.action.d-flex.align-items-center.mr-0(@click='like()', v-if='likeCount === 0', :class='{active: msg.likes[user._id]}') .action.d-flex.align-items-center.mr-0(@click='like()', v-if='likeCount === 0', :class='{active: msg.likes[user._id]}')
.svg-icon(v-html="icons.like", :title='$t("like")') .svg-icon(v-html="icons.like", :title='$t("like")')
span(v-if='!msg.likes[user._id]') {{ $t('like') }} span(v-if='!msg.likes[user._id] && !inbox') {{ $t('like') }}
</template> </template>
<style lang="scss"> <style lang="scss">

3
website/client/components/chat/chatMessages.vue
View File

@@ -3,7 +3,6 @@
.row .row
.col-12 .col-12
copy-as-todo-modal(:group-type='groupType', :group-name='groupName', :group-id='groupId') copy-as-todo-modal(:group-type='groupType', :group-name='groupName', :group-id='groupId')
report-flag-modal
div(v-for="(msg, index) in messages", v-if='chat && canViewFlag(msg)', :class='{row: inbox}') div(v-for="(msg, index) in messages", v-if='chat && canViewFlag(msg)', :class='{row: inbox}')
.d-flex(v-if='user._id !== msg.uuid', :class='{"flex-grow-1": inbox}') .d-flex(v-if='user._id !== msg.uuid', :class='{"flex-grow-1": inbox}')
avatar.avatar-left( avatar.avatar-left(
@@ -105,14 +104,12 @@ import findIndex from 'lodash/findIndex';
import Avatar from '../avatar'; import Avatar from '../avatar';
import copyAsTodoModal from './copyAsTodoModal'; import copyAsTodoModal from './copyAsTodoModal';
import reportFlagModal from './reportFlagModal';
import chatCard from './chatCard'; import chatCard from './chatCard';
export default { export default {
props: ['chat', 'groupType', 'groupId', 'groupName', 'inbox'], props: ['chat', 'groupType', 'groupId', 'groupName', 'inbox'],
components: { components: {
copyAsTodoModal, copyAsTodoModal,
reportFlagModal,
chatCard, chatCard,
Avatar, Avatar,
}, },