gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-11-03 22:44:46 +00:00
parent 038b3ed1eb c90834114b
commit a42414eabd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/RoomDirectory.js
View File

@ -409,7 +409,7 @@ module.exports = React.createClass({
perms = null; perms = null;
if (guestRead || guestJoin) { if (guestRead || guestJoin) {
perms = <div className="mx_RoomDirectory_perms">{guestRead} {guestJoin}</div>; perms = <div className="mx_RoomDirectory_perms">{guestRead}{guestJoin}</div>;
} }
var topic = rooms[i].topic || ''; var topic = rooms[i].topic || '';

1
src/skins/vector/css/vector-web/structures/_RoomDirectory.scss
View File

@ -100,6 +100,7 @@ limitations under the License.
display: inline; display: inline;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
margin-right: 5px;
height: 15px; height: 15px;
border-radius: 11px; border-radius: 11px;
background-color: $plinth-bg-color; background-color: $plinth-bg-color;