diff --git a/src/js/Timeline.js b/src/js/Timeline.js index 94e77bf..fa8f2e5 100644 --- a/src/js/Timeline.js +++ b/src/js/Timeline.js @@ -282,6 +282,7 @@ class Timeline extends Subscribable { if (eventData.type === "m.room.message" && eventData.content["m.relates_to"] && eventData.content["m.relates_to"].rel_type === "m.replace") { const replaces = eventData.content["m.relates_to"].event_id if (this.map.has(replaces)) { + console.log(eventData) const event = this.map.get(replaces) event.data.content = eventData.content["m.new_content"] event.setEdited(eventData.origin_server_ts) diff --git a/src/login.pug b/src/login.pug index 13acefd..954728c 100644 --- a/src/login.pug +++ b/src/login.pug @@ -1,28 +1,29 @@ doctype html html - head - meta(charset="utf-8") - link(rel="stylesheet" type="text/css" href=getStatic("/sass/login.sass")) - title Carbon - meta(name="viewport" content="width=device-width, initial-scale=1") + head + meta(charset="utf-8") + link(rel="stylesheet" type="text/css" href=getStatic("/sass/login.sass")) + title Carbon + meta(name="viewport" content= "width=device-width, initial-scale=1.0") - body - main.main - .center-login-container - h1 Welcome to the Matrix! - form.login-form - .data-input - .form-input-container - label(for="login") Username - input(type="text" name="login" autocomplete="username" required)#login - - .form-input-container - label(for="password") Password - input(name="password" autocomplete="current-password" type="password" required)#password - - .form-input-container - label(for="homeserver") Homeserver - input(type="text" name="homeserver" value="matrix.org" required)#homeserver - - .form-input-container - input(type="submit" value="Login") + body + main.main + div.center-login-container + h1 Welcome to the Matrix! + form.login-form + div.data-input + div.form-input-container + label(for="login") Username + input(type="text" name="login" autocomplete="username" required)#login + div.form-input-container + + label(for="password") Password + input(name="password" autocomplete="current-password" type="password" required)#password + div.form-input-container + + + label(for="homeserver") Homeserver + input(type="text" name="homeserver" value="matrix.org" required)#homeserver + div.form-input-container + + input(type="submit" value="Login") diff --git a/src/sass/components/groups.sass b/src/sass/components/groups.sass index e91f4cc..44685d5 100644 --- a/src/sass/components/groups.sass +++ b/src/sass/components/groups.sass @@ -33,7 +33,6 @@ $out-width: $base-width + rooms.$list-width &__container width: $out-width padding: $icon-padding - box-sizing: border-box .c-group display: flex diff --git a/src/sass/login.sass b/src/sass/login.sass index 92f443f..4040453 100644 --- a/src/sass/login.sass +++ b/src/sass/login.sass @@ -27,7 +27,8 @@ .data-input width: 100% - + + .form-input-container width: 100% display: flex @@ -54,3 +55,4 @@ input[type="submit"]:hover label font-size: 1.2em +