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

Reverted group flag code (#9784)

Browse Source 
* Reverted group flag code

* Reverted all flagging code

* Added hyphens back
This commit is contained in:
Keith Holliday
2018-01-11 12:04:07 -06:00
committed by GitHub
parent e96d0659cb
commit e0bf6d2e55
15 changed files with 229 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,6 @@ div
.mentioned-icon(v-if='isUserMentioned')
.message-hidden(v-if='msg.flagCount === 1 && user.contributor.admin') Message flagged once, not hidden
.message-hidden(v-if='msg.flagCount > 1 && user.contributor.admin') Message hidden
.flag-message(v-if='msg.flags && msg.flags[user._id]') {{$t('youFlaggedThisMessage')}}
.card-body
h3.leader(
:class='userLevelStyle(msg)',
@@ -50,7 +49,7 @@ div
top: -.5em;
}
.message-hidden, .flag-message {
.message-hidden {
margin-left: 1.5em;
margin-top: 1em;
color: red;