Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions css/icons.css
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,16 @@
background-image: url(../img/icon-mail-white.svg);
}

.app-talk .icon-team,
.talk-modal .icon-team,
.sidebar-callview .icon-team,
#talk-panel .icon-team,
#talk-sidebar .icon-team,
#call-container .icon-team,
.talkChatTab .icon-team {
background-image: url(../img/icon-team-white.svg);
}

.app-talk .icon-changelog,
.talk-modal .icon-changelog,
.sidebar-callview .icon-changelog,
Expand Down
3 changes: 3 additions & 0 deletions img/icon-team-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/components/ConversationIcon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ export default {
return 'icon-mail'
} else if (this.item.objectType === CONVERSATION.OBJECT_TYPE.PHONE) {
return 'icon-phone'
} else if (this.item.objectType === CONVERSATION.OBJECT_TYPE.CIRCLES) {
return 'icon-team'
} else if (this.item.type === CONVERSATION.TYPE.CHANGELOG) {
return 'icon-changelog'
} else if (this.item.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER) {
Expand All @@ -210,6 +212,11 @@ export default {
return undefined
}

if (this.item.objectType === CONVERSATION.OBJECT_TYPE.CIRCLES) {
// Team icon for group conversation suggestions
return 'icon-team'
}

if (this.item.type === CONVERSATION.TYPE.GROUP) {
// Group icon for group conversation suggestions
return 'icon-contacts'
Expand Down
10 changes: 10 additions & 0 deletions src/components/LeftSidebar/LeftSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,16 @@ export default {
overflow-y: auto !important;
overflow-x: hidden !important;
padding: 0;

// FIXME upstream: subname color was dropped
:deep(.list-item-content__subname) {
color: var(--color-text-maxcontrast);
}

:deep(.list-item-content__name),
:deep(.list-item-content__subname--bold) {
font-weight: 500;
}
}

.unread-mention-button {
Expand Down
1 change: 1 addition & 0 deletions src/components/PollViewer/PollVotersDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<AvatarWrapper v-for="(item, index) in details.slice(0, 8)"
:id="item.actorId"
:key="index"
:token="token"
:name="getDisplayName(item)"
:source="item.actorType"
:size="AVATAR.SIZE.EXTRA_SMALL"
Expand Down
1 change: 1 addition & 0 deletions src/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export const CONVERSATION = {
EMAIL: 'emails',
FILE: 'file',
PHONE: 'phone',
CIRCLES: 'circles',
VIDEO_VERIFICATION: 'share:password',
BREAKOUT_ROOM: 'room',
DEFAULT: '',
Expand Down