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

More fixes (#9006)

Browse Source 
* Reset user when clicking profile nav

* Added editprofile

* Add scroll to conversations and scroll to bottom on messages

* Fixed profile click

* Added notification mixin

* Fixed challenge edit assignment

* Guild list item now returns summary

* Fixed tier icons

* Fixed quest invitaion check

* Fixed extra loading of party members in modals

* Removed background from avatar in tutorial

* Changed port back

* Fixed task adding
This commit is contained in:
Keith Holliday
2017-08-30 15:19:17 -06:00
committed by GitHub
parent 5c16600b25
commit 65aabc8333
16 changed files with 125 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@
.card-block
h3.leader(:class='userLevelStyle(cachedProfileData[msg.uuid])')
| {{msg.user}}
.svg-icon(v-html="`icons.tier${cachedProfileData[msg.uuid].contributor.level}`", v-if='cachedProfileData[msg.uuid] && cachedProfileData[msg.uuid].contributor && cachedProfileData[msg.uuid].contributor.level')
.svg-icon(v-html="icons[`tier${cachedProfileData[msg.uuid].contributor.level}`]", v-if='cachedProfileData[msg.uuid] && cachedProfileData[msg.uuid].contributor && cachedProfileData[msg.uuid].contributor.level')
p {{msg.timestamp | timeAgo}}
.text(v-markdown='msg.text')
hr
@@ -103,16 +103,18 @@
color: #167e87;
}
.moderator {
.tier8 {
color: #277eab;
}
.staff {
.tier10 {
color: #6133b4;
}
.npc {
color: $black;
.tier9 {
color: #77f4c7;
fill: #77f4c7;
stroke: #005737;
}
// End of tier colors
@@ -202,9 +204,9 @@ import tier4 from 'assets/svg/tier-4.svg';
import tier5 from 'assets/svg/tier-5.svg';
import tier6 from 'assets/svg/tier-6.svg';
import tier7 from 'assets/svg/tier-7.svg';
import tierMod from 'assets/svg/tier-mod.svg';
import tierNPC from 'assets/svg/tier-npc.svg';
import tierStaff from 'assets/svg/tier-staff.svg';
import tier8 from 'assets/svg/tier-mod.svg';
import tier9 from 'assets/svg/tier-npc.svg';
import tier10 from 'assets/svg/tier-staff.svg';
export default {
props: ['chat', 'groupId', 'groupName', 'inbox'],
@@ -243,9 +245,9 @@ export default {
tier5,
tier6,
tier7,
tierMod,
tierNPC,
tierStaff,
tier8,
tier9,
tier10,
}),
copyingMessage: {},
currentDayDividerDisplay: moment().day(),