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

Fixes sept 1 (#9016)

Browse Source 
* Added avatars to inbox

* Added ordering of inbox messages

* Fixed blurb not converting to string

* Added message to member modal

* Added quest invites

* Moved filters to server
This commit is contained in:
Keith Holliday
2017-09-01 15:26:10 -06:00
committed by GitHub
parent e450e52836
commit c2aaa9b592
11 changed files with 180 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
website/client/components/groups/group.vue
View File

@@ -27,12 +27,15 @@
.col-12
h3(v-once) {{ $t('chat') }}
textarea(:placeholder="!isParty ? $t('chatPlaceholder') : $t('partyChatPlaceholder')", v-model='newMessage', @keydown='updateCarretPosition')
autocomplete(:text='newMessage', v-on:select="selectedAutocomplete", :coords='coords', :chat='group.chat')
button.btn.btn-secondary.send-chat.float-right(v-once, @click='sendMessage()') {{ $t('send') }}
button.btn.btn-secondary.float-left(v-once, @click='fetchRecentMessages()') {{ $t('fetchRecentMessages') }}
.col-12
chat-message(:chat.sync='group.chat', :group-id='group._id', group-name='group.name')
.row.new-message-row
textarea(:placeholder="!isParty ? $t('chatPlaceholder') : $t('partyChatPlaceholder')", v-model='newMessage', @keydown='updateCarretPosition')
autocomplete(:text='newMessage', v-on:select="selectedAutocomplete", :coords='coords', :chat='group.chat')
button.btn.btn-secondary.send-chat.float-right(v-once, @click='sendMessage()') {{ $t('send') }}
button.btn.btn-secondary.float-left(v-once, @click='fetchRecentMessages()') {{ $t('fetchRecentMessages') }}
.row
.col-12.hr
chat-message(:chat.sync='group.chat', :group-id='group._id', group-name='group.name')
.col-4.sidebar
.row(:class='{"guild-background": !isParty}')
@@ -256,11 +259,15 @@
.chat-row {
margin-top: 2em;
.send-chat {
margin-top: -3.5em;
z-index: 10;
.new-message-row {
position: relative;
margin-right: 1em;
}
.send-chat {
z-index: 10;
position: absolute;
right: 1em;
bottom: 3em;
}
}
@@ -370,6 +377,14 @@
height: 15px;
}
.hr {
width: 100%;
height: 20px;
border-bottom: 1px solid $gray-500;
text-align: center;
margin: 2em 0;
}
</style>
<script>