tweak topic type badges

This commit is contained in:
or-else
2022-12-16 09:11:05 -08:00
parent 10b24cc16e
commit c38e1832dc
13 changed files with 236 additions and 184 deletions
+2 -2
View File
@@ -2175,8 +2175,8 @@ ul.tabbar li.active > a {
.material-icons.as-badge { .material-icons.as-badge {
padding-left: 0.2rem; padding-left: 0.2rem;
font-size: 1.25rem; font-size: 1.15rem;
color: #bbb; color: #aaa;
} }
/* Badge with a label, like [you], [muted], etc */ /* Badge with a label, like [you], [muted], etc */
+1 -1
View File
File diff suppressed because one or more lines are too long
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

+1 -1
View File
@@ -1125,7 +1125,7 @@
"obsolete": false "obsolete": false
}, },
"tags_not_found": { "tags_not_found": {
"translation": "Тегов нет. Добавьте", "translation": "Тегов нет. Добавьте.",
"defaultMessage": "No tags defined. Add some.", "defaultMessage": "No tags defined. Add some.",
"description": "", "description": "",
"missing": false, "missing": false,
+1 -1
View File
File diff suppressed because one or more lines are too long
+2
View File
@@ -60,6 +60,7 @@ class ContactList extends React.Component {
} }
const isChannel = Tinode.isChannelTopicName(key); const isChannel = Tinode.isChannelTopicName(key);
const isGroup = !isChannel && Tinode.isGroupTopicName(key);
const selected = showCheckmark ? const selected = showCheckmark ?
(this.props.topicSelected.indexOf(key) > -1) : (this.props.topicSelected.indexOf(key) > -1) :
(this.props.topicSelected === key); (this.props.topicSelected === key);
@@ -112,6 +113,7 @@ class ContactList extends React.Component {
selected={selected} selected={selected}
showOnline={this.props.showOnline && !isChannel} showOnline={this.props.showOnline && !isChannel}
isChannel={isChannel} isChannel={isChannel}
isGroup={isGroup}
showContextMenu={this.props.showContextMenu} showContextMenu={this.props.showContextMenu}
isVerified={c.trusted && c.trusted.verified} isVerified={c.trusted && c.trusted.verified}
isStaff={c.trusted && c.trusted.staff} isStaff={c.trusted && c.trusted.staff}
+1
View File
@@ -105,6 +105,7 @@ class Contact extends React.Component {
</div> </div>
<div className="text-box"> <div className="text-box">
<div><span className={titleClass}>{title}</span> <div><span className={titleClass}>{title}</span>
{this.props.isGroup ? <i className="material-icons as-badge">group</i> : null}
{this.props.isChannel ? <img src="/img/channel.png" className="channel" alt="channel" /> : null} {this.props.isChannel ? <img src="/img/channel.png" className="channel" alt="channel" /> : null}
<ContactBadges badges={icon_badges} /> <ContactBadges badges={icon_badges} />
{!this.props.deleted ? <UnreadBadge count={this.props.unread} /> : null} {!this.props.deleted ? <UnreadBadge count={this.props.unread} /> : null}
+6 -2
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+218 -173
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long