fix: Lock icon colour issue in private messages (#4009)

* fix: Lock icon colour issue in private messages

* minor fixes
This commit is contained in:
Sivin Varghese
2022-02-17 18:58:53 +05:30
committed by GitHub
parent b9025a98d3
commit 2586c8e7e5
2 changed files with 14 additions and 9 deletions

View File

@@ -19,14 +19,16 @@
v-if="isPrivate" v-if="isPrivate"
v-tooltip.top-start="$t('CONVERSATION.VISIBLE_TO_AGENTS')" v-tooltip.top-start="$t('CONVERSATION.VISIBLE_TO_AGENTS')"
icon="lock-closed" icon="lock-closed"
class="action--icon" class="action--icon lock--icon--private"
size="16" size="16"
@mouseenter="isHovered = true" @mouseenter="isHovered = true"
@mouseleave="isHovered = false" @mouseleave="isHovered = false"
/> />
<button @click="onTweetReply"> <button
<fluent-icon
v-if="isATweet && (isIncoming || isOutgoing) && sourceId" v-if="isATweet && (isIncoming || isOutgoing) && sourceId"
@click="onTweetReply"
>
<fluent-icon
v-tooltip.top-start="$t('CHAT_LIST.REPLY_TO_TWEET')" v-tooltip.top-start="$t('CHAT_LIST.REPLY_TO_TWEET')"
icon="arrow-reply" icon="arrow-reply"
class="action--icon cursor-pointer" class="action--icon cursor-pointer"
@@ -141,6 +143,10 @@ export default {
.action--icon { .action--icon {
color: var(--white); color: var(--white);
} }
.lock--icon--private {
color: var(--s-400);
}
} }
} }
@@ -205,7 +211,7 @@ export default {
.is-private { .is-private {
.message-text--metadata { .message-text--metadata {
align-items: flex-end; align-items: center;
.time { .time {
color: var(--s-400); color: var(--s-400);

View File

@@ -441,9 +441,8 @@ export default {
const formattedConditions = automation.conditions.map(condition => { const formattedConditions = automation.conditions.map(condition => {
const inputType = this.automationTypes[ const inputType = this.automationTypes[
automation.event_name automation.event_name
].conditions.find( ].conditions.find(item => item.key === condition.attribute_key)
item => item.key === condition.attribute_key .inputType;
).inputType;
if (inputType === 'plain_text') { if (inputType === 'plain_text') {
return { return {
...condition, ...condition,