merge devel

css/base.css

@@ -1080,15 +1080,15 @@ i.search {
 }
 
 img.channel {
-  width: 1rem;
+  width: 1.25rem;
-  height: 1rem;
+  height: 1.25rem;
   vertical-align: middle;
   margin-left: 0.3rem;
 }
 
 .large img.channel {
-  width: 1.35rem;
+  width: 1.45rem;
-  height: 1.35rem;
+  height: 1.45rem;
   margin-left: 0.5rem;
   margin-bottom: 0.15rem;
 }
@@ -2222,8 +2222,8 @@ ul.tabbar li.active > a {
 
 .material-icons.as-badge {
   padding-left: 0.2rem;
-  font-size: 1.25rem;
+  font-size: 1.15rem;
-  color: #bbb;
+  color: #aaa;
 }
 
 /* Badge with a label, like [you], [muted], etc */

src/i18n/ru.json

@@ -1118,7 +1118,7 @@
     "obsolete": false
   },
   "tags_not_found": {
-    "translation": "Тегов нет. Добавьте",
+    "translation": "Тегов нет. Добавьте.",
     "defaultMessage": "No tags defined. Add some.",
     "description": "",
     "missing": false,

src/widgets/contact-list.jsx

@@ -60,6 +60,7 @@ class ContactList extends React.Component {
           }
 
           const isChannel = Tinode.isChannelTopicName(key);
+          const isGroup = !isChannel && Tinode.isGroupTopicName(key);
           const selected = showCheckmark ?
             (this.props.topicSelected.indexOf(key) > -1) :
             (this.props.topicSelected === key);
@@ -112,6 +113,7 @@ class ContactList extends React.Component {
               selected={selected}
               showOnline={this.props.showOnline && !isChannel}
               isChannel={isChannel}
+              isGroup={isGroup}
               showContextMenu={this.props.showContextMenu}
               isVerified={c.trusted && c.trusted.verified}
               isStaff={c.trusted && c.trusted.staff}

src/widgets/contact.jsx

@@ -105,6 +105,7 @@ class Contact extends React.Component {
         </div>
         <div className="text-box">
           <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}
             <ContactBadges badges={icon_badges} />
             {!this.props.deleted ? <UnreadBadge count={this.props.unread} /> : null}

umd/index.dev.js

@@ -11779,6 +11779,7 @@ class ContactList extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
             }
           }
           const isChannel = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.isChannelTopicName(key);
+          const isGroup = !isChannel && tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.isGroupTopicName(key);
           const selected = showCheckmark ? this.props.topicSelected.indexOf(key) > -1 : this.props.topicSelected === key;
           const badges = [];
           if (this.props.showMode) {
@@ -11829,6 +11830,7 @@ class ContactList extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
             selected: selected,
             showOnline: this.props.showOnline && !isChannel,
             isChannel: isChannel,
+            isGroup: isGroup,
             showContextMenu: this.props.showContextMenu,
             isVerified: c.trusted && c.trusted.verified,
             isStaff: c.trusted && c.trusted.staff,
@@ -12011,7 +12013,9 @@ class Contact extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) {
       className: "text-box"
     }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", {
       className: titleClass
-    }, title), this.props.isChannel ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement("img", {
+    }, title), this.props.isGroup ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", {
+      className: "material-icons as-badge"
+    }, "group") : null, this.props.isChannel ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement("img", {
       src: "/img/channel.png",
       className: "channel",
       alt: "channel"