mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-10-04 13:51:30 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into bwindels/upload-images

Browse Source
This commit is contained in:
Bruno Windels 2020-11-16 19:31:04 +01:00
commit 91f7970d66
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/domain/session/room/RoomViewModel.js
View File

@ -149,7 +149,7 @@ export class RoomViewModel extends ViewModel {
try { try {
let msgtype = "m.text"; let msgtype = "m.text";
if (message.startsWith("/me ")) { if (message.startsWith("/me ")) {
message = message.substr(3).trim(); message = message.substr(4).trim();
msgtype = "m.emote"; msgtype = "m.emote";
} }
await this._room.sendEvent("m.room.message", {msgtype, body: message}); await this._room.sendEvent("m.room.message", {msgtype, body: message});

10
src/platform/web/ui/css/layout.css
View File

@ -170,3 +170,13 @@ main {
position: absolute; position: absolute;
z-index: 2; z-index: 2;
} }
.Settings {
display: flex;
flex-direction: column;
}
.SettingsBody {
min-height: 0;
overflow-y: auto;
}